database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-27 07:42:10 +03:00
Code Activity

More unconstify use

Browse Source 
Replace casts whose only purpose is to cast away const with the
unconstify() macro.

Discussion: https://www.postgresql.org/message-id/flat/53a28052-f9f3-1808-fed9-460fd43035ab%402ndquadrant.com
This commit is contained in:
Peter Eisentraut
2019-01-29 01:16:24 +01:00
parent cf40dc65b6
commit 37d9916020
25 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/interfaces/libpq/fe-lobj.c
View File

@@ -341,7 +341,7 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len)
argv[1].isint = 0;
argv[1].len = (int) len;
argv[1].u.ptr = (int *) buf;
argv[1].u.ptr = (int *) unconstify(char *, buf);
res = PQfn(conn, conn->lobjfuncs->fn_lo_write,
&retval, &result_len, 1, argv, 2);

8
src/interfaces/libpq/pqexpbuffer.c
View File

@@ -36,6 +36,8 @@
/* All "broken" PQExpBuffers point to this string. */
static const char oom_buffer[1] = "";
/* Need a char * for unconstify() compatiblity */
static const char * oom_buffer_ptr = oom_buffer;
static bool appendPQExpBufferVA(PQExpBuffer str, const char *fmt, va_list args) pg_attribute_printf(2, 0);
@@ -57,7 +59,7 @@ markPQExpBufferBroken(PQExpBuffer str)
* to put oom_buffer in read-only storage, so that anyone who tries to
* scribble on a broken PQExpBuffer will get a failure.
*/
str->data = (char *) oom_buffer;
str->data = unconstify(char *, oom_buffer_ptr);
str->len = 0;
str->maxlen = 0;
}
@@ -91,7 +93,7 @@ initPQExpBuffer(PQExpBuffer str)
str->data = (char *) malloc(INITIAL_EXPBUFFER_SIZE);
if (str->data == NULL)
{
str->data = (char *) oom_buffer; /* see comment above */
str->data = unconstify(char *, oom_buffer_ptr); /* see comment above */
str->maxlen = 0;
str->len = 0;
}
@@ -130,7 +132,7 @@ termPQExpBuffer(PQExpBuffer str)
if (str->data != oom_buffer)
free(str->data);
/* just for luck, make the buffer validly empty. */
str->data = (char *) oom_buffer; /* see comment above */
str->data = unconstify(char *, oom_buffer_ptr); /* see comment above */
str->maxlen = 0;
str->len = 0;
}