From 4709c40820a25151bc6426d43319d746ee384371 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 22 Sep 2025 14:47:48 +0200 Subject: [PATCH 05/23] C11 anonymous unions [libpq] --- src/interfaces/libpq/fe-lobj.c | 44 ++++++++++++++--------------- src/interfaces/libpq/fe-protocol3.c | 4 +-- src/interfaces/libpq/libpq-fe.h | 4 +-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index 05e17bed508..1546b770f6e 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -66,11 +66,11 @@ lo_open(PGconn *conn, Oid lobjId, int mode) argv[0].isint = 1; argv[0].len = 4; - argv[0].u.integer = lobjId; + argv[0].integer = lobjId; argv[1].isint = 1; argv[1].len = 4; - argv[1].u.integer = mode; + argv[1].integer = mode; res = PQfn(conn, conn->lobjfuncs->fn_lo_open, &fd, &result_len, 1, argv, 2); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -105,7 +105,7 @@ lo_close(PGconn *conn, int fd) argv[0].isint = 1; argv[0].len = 4; - argv[0].u.integer = fd; + argv[0].integer = fd; res = PQfn(conn, conn->lobjfuncs->fn_lo_close, &retval, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -163,11 +163,11 @@ lo_truncate(PGconn *conn, int fd, size_t len) argv[0].isint = 1; argv[0].len = 4; - argv[0].u.integer = fd; + argv[0].integer = fd; argv[1].isint = 1; argv[1].len = 4; - argv[1].u.integer = (int) len; + argv[1].integer = (int) len; res = PQfn(conn, conn->lobjfuncs->fn_lo_truncate, &retval, &result_len, 1, argv, 2); @@ -211,12 +211,12 @@ lo_truncate64(PGconn *conn, int fd, int64_t len) argv[0].isint = 1; argv[0].len = 4; - argv[0].u.integer = fd; + argv[0].integer = fd; len = lo_hton64(len); argv[1].isint = 0; argv[1].len = 8; - argv[1].u.ptr = (int *) &len; + argv[1].ptr = (int *) &len; res = PQfn(conn, conn->lobjfuncs->fn_lo_truncate64, &retval, &result_len, 1, argv, 2); @@ -265,11 +265,11 @@ lo_read(PGconn *conn, int fd, char *buf, size_t len) argv[0].isint = 1; argv[0].len = 4; - argv[0].u.integer = fd; + argv[0].integer = fd; argv[1].isint = 1; argv[1].len = 4; - argv[1].u.integer = (int) len; + argv[1].integer = (int) len; res = PQfn(conn, conn->lobjfuncs->fn_lo_read, (void *) buf, &result_len, 0, argv, 2); @@ -316,11 +316,11 @@ lo_write(PGconn *conn, int fd, const char *buf, size_t len) argv[0].isint = 1; argv[0].len = 4; - argv[0].u.integer = fd; + argv[0].integer = fd; argv[1].isint = 0; argv[1].len = (int) len; - argv[1].u.ptr = (int *) unconstify(char *, buf); + argv[1].ptr = (int *) unconstify(char *, buf); res = PQfn(conn, conn->lobjfuncs->fn_lo_write, &retval, &result_len, 1, argv, 2); @@ -353,15 +353,15 @@ lo_lseek(PGconn *conn, int fd, int offset, int whence) argv[0].isint = 1; argv[0].len = 4; - argv[0].u.integer = fd; + argv[0].integer = fd; argv[1].isint = 1; argv[1].len = 4; - argv[1].u.integer = offset; + argv[1].integer = offset; argv[2].isint = 1; argv[2].len = 4; - argv[2].u.integer = whence; + argv[2].integer = whence; res = PQfn(conn, conn->lobjfuncs->fn_lo_lseek, &retval, &result_len, 1, argv, 3); @@ -401,16 +401,16 @@ lo_lseek64(PGconn *conn, int fd, int64_t offset, int whence) argv[0].isint = 1; argv[0].len = 4; - argv[0].u.integer = fd; + argv[0].integer = fd; offset = lo_hton64(offset); argv[1].isint = 0; argv[1].len = 8; - argv[1].u.ptr = (int *) &offset; + argv[1].ptr = (int *) &offset; argv[2].isint = 1; argv[2].len = 4; - argv[2].u.integer = whence; + argv[2].integer = whence; res = PQfn(conn, conn->lobjfuncs->fn_lo_lseek64, (void *) &retval, &result_len, 0, argv, 3); @@ -447,7 +447,7 @@ lo_creat(PGconn *conn, int mode) argv[0].isint = 1; argv[0].len = 4; - argv[0].u.integer = mode; + argv[0].integer = mode; res = PQfn(conn, conn->lobjfuncs->fn_lo_creat, &retval, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -491,7 +491,7 @@ lo_create(PGconn *conn, Oid lobjId) argv[0].isint = 1; argv[0].len = 4; - argv[0].u.integer = lobjId; + argv[0].integer = lobjId; res = PQfn(conn, conn->lobjfuncs->fn_lo_create, &retval, &result_len, 1, argv, 1); if (PQresultStatus(res) == PGRES_COMMAND_OK) @@ -524,7 +524,7 @@ lo_tell(PGconn *conn, int fd) argv[0].isint = 1; argv[0].len = 4; - argv[0].u.integer = fd; + argv[0].integer = fd; res = PQfn(conn, conn->lobjfuncs->fn_lo_tell, &retval, &result_len, 1, argv, 1); @@ -564,7 +564,7 @@ lo_tell64(PGconn *conn, int fd) argv[0].isint = 1; argv[0].len = 4; - argv[0].u.integer = fd; + argv[0].integer = fd; res = PQfn(conn, conn->lobjfuncs->fn_lo_tell64, (void *) &retval, &result_len, 0, argv, 1); @@ -598,7 +598,7 @@ lo_unlink(PGconn *conn, Oid lobjId) argv[0].isint = 1; argv[0].len = 4; - argv[0].u.integer = lobjId; + argv[0].integer = lobjId; res = PQfn(conn, conn->lobjfuncs->fn_lo_unlink, &retval, &result_len, 1, argv, 1); diff --git a/src/interfaces/libpq/fe-protocol3.c b/src/interfaces/libpq/fe-protocol3.c index da7a8db68c8..c941a4c1664 100644 --- a/src/interfaces/libpq/fe-protocol3.c +++ b/src/interfaces/libpq/fe-protocol3.c @@ -2175,12 +2175,12 @@ pqFunctionCall3(PGconn *conn, Oid fnid, if (args[i].isint) { - if (pqPutInt(args[i].u.integer, args[i].len, conn)) + if (pqPutInt(args[i].integer, args[i].len, conn)) return NULL; } else { - if (pqPutnchar(args[i].u.ptr, args[i].len, conn)) + if (pqPutnchar(args[i].ptr, args[i].len, conn)) return NULL; } } diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index 0852584edae..83d5c071097 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -293,9 +293,9 @@ typedef struct int isint; union { - int *ptr; /* can't use void (dec compiler barfs) */ + void *ptr; int integer; - } u; + }; } PQArgBlock; /* ---------------- -- 2.51.0