diff options
author | David Rowley | 2022-10-07 00:13:27 +0000 |
---|---|---|
committer | David Rowley | 2022-10-07 00:13:27 +0000 |
commit | cd4e8caaa0eb5c3d3b12a45b29035e7a4bdfa4a8 (patch) | |
tree | 1224839ecbcbd206305dc3bf12403ab3e42e3488 /src/interfaces/libpq/fe-secure-gssapi.c | |
parent | 4289263cf263ba36e474728f4a02ceb086903f81 (diff) |
Fix final warnings produced by -Wshadow=compatible-local
I thought I had these in d8df67bb1, but per report from Andres Freund, I
missed some.
Reviewed-by: Andres Freund
Discussion: https://postgr.es/m/20221005214052.c4tkudawyp5wxt3c@awork3.anarazel.de
Diffstat (limited to 'src/interfaces/libpq/fe-secure-gssapi.c')
-rw-r--r-- | src/interfaces/libpq/fe-secure-gssapi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/interfaces/libpq/fe-secure-gssapi.c b/src/interfaces/libpq/fe-secure-gssapi.c index 6ea52ed866d..dee0982eba2 100644 --- a/src/interfaces/libpq/fe-secure-gssapi.c +++ b/src/interfaces/libpq/fe-secure-gssapi.c @@ -135,11 +135,11 @@ pg_GSS_write(PGconn *conn, const void *ptr, size_t len) */ if (PqGSSSendLength) { - ssize_t ret; + ssize_t retval; ssize_t amount = PqGSSSendLength - PqGSSSendNext; - ret = pqsecure_raw_write(conn, PqGSSSendBuffer + PqGSSSendNext, amount); - if (ret <= 0) + retval = pqsecure_raw_write(conn, PqGSSSendBuffer + PqGSSSendNext, amount); + if (retval <= 0) { /* * Report any previously-sent data; if there was none, reflect @@ -149,16 +149,16 @@ pg_GSS_write(PGconn *conn, const void *ptr, size_t len) */ if (bytes_sent) return bytes_sent; - return ret; + return retval; } /* * Check if this was a partial write, and if so, move forward that * far in our buffer and try again. */ - if (ret != amount) + if (retval != amount) { - PqGSSSendNext += ret; + PqGSSSendNext += retval; continue; } |