Skip to content

Commit a925862

Browse files
committed
Make TLS write functions' buffer arguments pointers const
This also makes it match the equivalent APIs in libpq. Author: Dagfinn Ilmari Mannsåker <[email protected]> Discussion: https://www.postgresql.org/message-id/flat/fd1fcedb-3492-4fc8-9e3e-74b97f2db6c7%40eisentraut.org
1 parent 1692080 commit a925862

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

src/backend/libpq/be-secure-gssapi.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ static uint32 PqGSSMaxPktSize; /* Maximum size we can encrypt and fit the
9393
* failure if necessary, and then return an errno indicating connection loss.
9494
*/
9595
ssize_t
96-
be_gssapi_write(Port *port, void *ptr, size_t len)
96+
be_gssapi_write(Port *port, const void *ptr, size_t len)
9797
{
9898
OM_uint32 major,
9999
minor;

src/backend/libpq/be-secure-openssl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ be_tls_read(Port *port, void *ptr, size_t len, int *waitfor)
821821
}
822822

823823
ssize_t
824-
be_tls_write(Port *port, void *ptr, size_t len, int *waitfor)
824+
be_tls_write(Port *port, const void *ptr, size_t len, int *waitfor)
825825
{
826826
ssize_t n;
827827
int err;

src/backend/libpq/be-secure.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ secure_raw_read(Port *port, void *ptr, size_t len)
302302
* Write data to a secure connection.
303303
*/
304304
ssize_t
305-
secure_write(Port *port, void *ptr, size_t len)
305+
secure_write(Port *port, const void *ptr, size_t len)
306306
{
307307
ssize_t n;
308308
int waitfor;

src/backend/libpq/pqcomm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1368,7 +1368,7 @@ internal_flush_buffer(const char *buf, size_t *start, size_t *end)
13681368
{
13691369
int r;
13701370

1371-
r = secure_write(MyProcPort, (char *) bufptr, bufend - bufptr);
1371+
r = secure_write(MyProcPort, bufptr, bufend - bufptr);
13721372

13731373
if (r <= 0)
13741374
{

src/include/libpq/libpq-be.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ extern ssize_t be_tls_read(Port *port, void *ptr, size_t len, int *waitfor);
312312
/*
313313
* Write data to a secure connection.
314314
*/
315-
extern ssize_t be_tls_write(Port *port, void *ptr, size_t len, int *waitfor);
315+
extern ssize_t be_tls_write(Port *port, const void *ptr, size_t len, int *waitfor);
316316

317317
/*
318318
* Return information about the SSL connection.
@@ -352,7 +352,7 @@ extern bool be_gssapi_get_delegation(Port *port);
352352

353353
/* Read and write to a GSSAPI-encrypted connection. */
354354
extern ssize_t be_gssapi_read(Port *port, void *ptr, size_t len);
355-
extern ssize_t be_gssapi_write(Port *port, void *ptr, size_t len);
355+
extern ssize_t be_gssapi_write(Port *port, const void *ptr, size_t len);
356356
#endif /* ENABLE_GSS */
357357

358358
extern PGDLLIMPORT ProtocolVersion FrontendProtocol;

src/include/libpq/libpq.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ extern void secure_destroy(void);
9292
extern int secure_open_server(Port *port);
9393
extern void secure_close(Port *port);
9494
extern ssize_t secure_read(Port *port, void *ptr, size_t len);
95-
extern ssize_t secure_write(Port *port, void *ptr, size_t len);
95+
extern ssize_t secure_write(Port *port, const void *ptr, size_t len);
9696
extern ssize_t secure_raw_read(Port *port, void *ptr, size_t len);
9797
extern ssize_t secure_raw_write(Port *port, const void *ptr, size_t len);
9898

0 commit comments

Comments
 (0)