mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change argument type of pq_sendbytes from char * to void *

Browse Source 
This is a follow-up to 1f605b82ba66ece8b421b10d41094dd2e3c0c48b.  It
allows getting rid of further casts at call sites.

Reviewed-by: Corey Huinker <corey.huinker@gmail.com>
Discussion: https://www.postgresql.org/message-id/783a4edb-84f9-6df2-7470-2ef5ccc6607a@enterprisedb.com
This commit is contained in:
Peter Eisentraut 2023-02-14 13:32:19 +01:00
parent a8a44828a2
commit 3b12e68a5c
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/libpq/pqformat.c
View File

@ -123,7 +123,7 @@ pq_beginmessage_reuse(StringInfo buf, char msgtype)
* -------------------------------- * --------------------------------
*/ */
void void
pq_sendbytes(StringInfo buf, const char *data, int datalen) pq_sendbytes(StringInfo buf, const void *data, int datalen)
{ {
/* use variant that maintains a trailing null-byte, out of caution */ /* use variant that maintains a trailing null-byte, out of caution */
appendBinaryStringInfo(buf, data, datalen); appendBinaryStringInfo(buf, data, datalen);

11
src/backend/utils/adt/array_userfuncs.c
View File

@ -654,7 +654,7 @@ array_agg_serialize(PG_FUNCTION_ARGS)
pq_sendbyte(&buf, state->typalign); pq_sendbyte(&buf, state->typalign);
/* dnulls */ /* dnulls */
pq_sendbytes(&buf, (char *) state->dnulls, sizeof(bool) * state->nelems); pq_sendbytes(&buf, state->dnulls, sizeof(bool) * state->nelems);
/* /*
* dvalues. By agreement with array_agg_deserialize, when the element * dvalues. By agreement with array_agg_deserialize, when the element
@ -664,8 +664,7 @@ array_agg_serialize(PG_FUNCTION_ARGS)
* must be sent first). * must be sent first).
*/ */
if (state->typbyval) if (state->typbyval)
pq_sendbytes(&buf, (char *) state->dvalues, pq_sendbytes(&buf, state->dvalues, sizeof(Datum) * state->nelems);
sizeof(Datum) * state->nelems);
else else
{ {
SerialIOData *iodata; SerialIOData *iodata;
@ -1097,7 +1096,7 @@ array_agg_array_serialize(PG_FUNCTION_ARGS)
if (state->nullbitmap) if (state->nullbitmap)
{ {
Assert(state->aitems > 0); Assert(state->aitems > 0);
pq_sendbytes(&buf, (char *) state->nullbitmap, (state->aitems + 7) / 8); pq_sendbytes(&buf, state->nullbitmap, (state->aitems + 7) / 8);
} }
/* nitems */ /* nitems */
@ -1107,10 +1106,10 @@ array_agg_array_serialize(PG_FUNCTION_ARGS)
pq_sendint32(&buf, state->ndims); pq_sendint32(&buf, state->ndims);
/* dims: XXX should we just send ndims elements? */ /* dims: XXX should we just send ndims elements? */
pq_sendbytes(&buf, (char *) state->dims, sizeof(state->dims)); pq_sendbytes(&buf, state->dims, sizeof(state->dims));
/* lbs */ /* lbs */
pq_sendbytes(&buf, (char *) state->lbs, sizeof(state->lbs)); pq_sendbytes(&buf, state->lbs, sizeof(state->lbs));
result = pq_endtypsend(&buf); result = pq_endtypsend(&buf);

2
src/backend/utils/adt/uuid.c
View File

@ -154,7 +154,7 @@ uuid_send(PG_FUNCTION_ARGS)
StringInfoData buffer; StringInfoData buffer;
pq_begintypsend(&buffer); pq_begintypsend(&buffer);
pq_sendbytes(&buffer, (char *) uuid->data, UUID_LEN); pq_sendbytes(&buffer, uuid->data, UUID_LEN);
PG_RETURN_BYTEA_P(pq_endtypsend(&buffer)); PG_RETURN_BYTEA_P(pq_endtypsend(&buffer));
} }

2
src/backend/utils/adt/varbit.c
View File

@ -685,7 +685,7 @@ varbit_send(PG_FUNCTION_ARGS)
pq_begintypsend(&buf); pq_begintypsend(&buf);
pq_sendint32(&buf, VARBITLEN(s)); pq_sendint32(&buf, VARBITLEN(s));
pq_sendbytes(&buf, (char *) VARBITS(s), VARBITBYTES(s)); pq_sendbytes(&buf, VARBITS(s), VARBITBYTES(s));
PG_RETURN_BYTEA_P(pq_endtypsend(&buf)); PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
} }

2
src/include/libpq/pqformat.h
View File

@ -22,7 +22,7 @@ extern void pq_beginmessage_reuse(StringInfo buf, char msgtype);
extern void pq_endmessage(StringInfo buf); extern void pq_endmessage(StringInfo buf);
extern void pq_endmessage_reuse(StringInfo buf); extern void pq_endmessage_reuse(StringInfo buf);
extern void pq_sendbytes(StringInfo buf, const char *data, int datalen); extern void pq_sendbytes(StringInfo buf, const void *data, int datalen);
extern void pq_sendcountedtext(StringInfo buf, const char *str, int slen, extern void pq_sendcountedtext(StringInfo buf, const char *str, int slen,
bool countincludesself); bool countincludesself);
extern void pq_sendtext(StringInfo buf, const char *str, int slen); extern void pq_sendtext(StringInfo buf, const char *str, int slen);