@@ -48,8 +48,8 @@ static void convertJsonbObject(StringInfo buffer, JEntry *header, JsonbValue *va
48
48
static void convertJsonbScalar (StringInfo buffer ,JEntry * header ,JsonbValue * scalarVal );
49
49
50
50
static int reserveFromBuffer (StringInfo buffer ,int len );
51
- static void appendToBuffer (StringInfo buffer ,const char * data ,int len );
52
- static void copyToBuffer (StringInfo buffer ,int offset ,const char * data ,int len );
51
+ static void appendToBuffer (StringInfo buffer ,const void * data ,int len );
52
+ static void copyToBuffer (StringInfo buffer ,int offset ,const void * data ,int len );
53
53
static short padBufferToInt (StringInfo buffer );
54
54
55
55
static JsonbIterator * iteratorFromContainer (JsonbContainer * container ,JsonbIterator * parent );
@@ -1508,7 +1508,7 @@ reserveFromBuffer(StringInfo buffer, int len)
1508
1508
* Copy 'len' bytes to a previously reserved area in buffer.
1509
1509
*/
1510
1510
static void
1511
- copyToBuffer (StringInfo buffer ,int offset ,const char * data ,int len )
1511
+ copyToBuffer (StringInfo buffer ,int offset ,const void * data ,int len )
1512
1512
{
1513
1513
memcpy (buffer -> data + offset ,data ,len );
1514
1514
}
@@ -1517,7 +1517,7 @@ copyToBuffer(StringInfo buffer, int offset, const char *data, int len)
1517
1517
* A shorthand for reserveFromBuffer + copyToBuffer.
1518
1518
*/
1519
1519
static void
1520
- appendToBuffer (StringInfo buffer ,const char * data ,int len )
1520
+ appendToBuffer (StringInfo buffer ,const void * data ,int len )
1521
1521
{
1522
1522
int offset ;
1523
1523
@@ -1646,7 +1646,7 @@ convertJsonbArray(StringInfo buffer, JEntry *header, JsonbValue *val, int level)
1646
1646
containerhead |=JB_FSCALAR ;
1647
1647
}
1648
1648
1649
- appendToBuffer (buffer ,( char * ) & containerhead ,sizeof (uint32 ));
1649
+ appendToBuffer (buffer ,& containerhead ,sizeof (uint32 ));
1650
1650
1651
1651
/* Reserve space for the JEntries of the elements. */
1652
1652
jentry_offset = reserveFromBuffer (buffer ,sizeof (JEntry )* nElems );
@@ -1684,7 +1684,7 @@ convertJsonbArray(StringInfo buffer, JEntry *header, JsonbValue *val, int level)
1684
1684
if ((i %JB_OFFSET_STRIDE )== 0 )
1685
1685
meta = (meta & JENTRY_TYPEMASK ) |totallen |JENTRY_HAS_OFF ;
1686
1686
1687
- copyToBuffer (buffer ,jentry_offset ,( char * ) & meta ,sizeof (JEntry ));
1687
+ copyToBuffer (buffer ,jentry_offset ,& meta ,sizeof (JEntry ));
1688
1688
jentry_offset += sizeof (JEntry );
1689
1689
}
1690
1690
@@ -1723,7 +1723,7 @@ convertJsonbObject(StringInfo buffer, JEntry *header, JsonbValue *val, int level
1723
1723
* variable-length payload.
1724
1724
*/
1725
1725
containerheader = nPairs |JB_FOBJECT ;
1726
- appendToBuffer (buffer ,( char * ) & containerheader ,sizeof (uint32 ));
1726
+ appendToBuffer (buffer ,& containerheader ,sizeof (uint32 ));
1727
1727
1728
1728
/* Reserve space for the JEntries of the keys and values. */
1729
1729
jentry_offset = reserveFromBuffer (buffer ,sizeof (JEntry )* nPairs * 2 );
@@ -1765,7 +1765,7 @@ convertJsonbObject(StringInfo buffer, JEntry *header, JsonbValue *val, int level
1765
1765
if ((i %JB_OFFSET_STRIDE )== 0 )
1766
1766
meta = (meta & JENTRY_TYPEMASK ) |totallen |JENTRY_HAS_OFF ;
1767
1767
1768
- copyToBuffer (buffer ,jentry_offset ,( char * ) & meta ,sizeof (JEntry ));
1768
+ copyToBuffer (buffer ,jentry_offset ,& meta ,sizeof (JEntry ));
1769
1769
jentry_offset += sizeof (JEntry );
1770
1770
}
1771
1771
for (i = 0 ;i < nPairs ;i ++ )
@@ -1800,7 +1800,7 @@ convertJsonbObject(StringInfo buffer, JEntry *header, JsonbValue *val, int level
1800
1800
if (((i + nPairs ) %JB_OFFSET_STRIDE )== 0 )
1801
1801
meta = (meta & JENTRY_TYPEMASK ) |totallen |JENTRY_HAS_OFF ;
1802
1802
1803
- copyToBuffer (buffer ,jentry_offset ,( char * ) & meta ,sizeof (JEntry ));
1803
+ copyToBuffer (buffer ,jentry_offset ,& meta ,sizeof (JEntry ));
1804
1804
jentry_offset += sizeof (JEntry );
1805
1805
}
1806
1806
@@ -1840,7 +1840,7 @@ convertJsonbScalar(StringInfo buffer, JEntry *header, JsonbValue *scalarVal)
1840
1840
numlen = VARSIZE_ANY (scalarVal -> val .numeric );
1841
1841
padlen = padBufferToInt (buffer );
1842
1842
1843
- appendToBuffer (buffer ,( char * ) scalarVal -> val .numeric ,numlen );
1843
+ appendToBuffer (buffer ,scalarVal -> val .numeric ,numlen );
1844
1844
1845
1845
* header = JENTRY_ISNUMERIC | (padlen + numlen );
1846
1846
break ;