From 2d0bbedda7c4fbf7092c39b0c06b56cb238e15d7 Mon Sep 17 00:00:00 2001 From: David Rowley Date: Wed, 5 Oct 2022 21:01:41 +1300 Subject: Rename shadowed local variables In a similar effort to f01592f91, here we mostly rename shadowed local variables to remove the warnings produced when compiling with -Wshadow=compatible-local. This fixes 63 warnings and leaves just 5. Author: Justin Pryzby, David Rowley Reviewed-by: Justin Pryzby Discussion https://postgr.es/m/20220817145434.GC26426%40telsasoft.com --- src/interfaces/ecpg/ecpglib/execute.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/interfaces/ecpg/ecpglib/execute.c') diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c index bd94bd4e6c6..641851983d3 100644 --- a/src/interfaces/ecpg/ecpglib/execute.c +++ b/src/interfaces/ecpg/ecpglib/execute.c @@ -367,10 +367,10 @@ ecpg_store_result(const PGresult *results, int act_field, /* check strlen for each tuple */ for (act_tuple = 0; act_tuple < ntuples; act_tuple++) { - int len = strlen(PQgetvalue(results, act_tuple, act_field)) + 1; + int slen = strlen(PQgetvalue(results, act_tuple, act_field)) + 1; - if (len > var->varcharsize) - var->varcharsize = len; + if (slen > var->varcharsize) + var->varcharsize = slen; } var->offset *= var->varcharsize; len = var->offset * ntuples; -- cgit v1.2.3