diff options
| author | David Rowley <drowley@postgresql.org> | 2022-10-05 21:01:41 +1300 |
|---|---|---|
| committer | David Rowley <drowley@postgresql.org> | 2022-10-05 21:01:41 +1300 |
| commit | 2d0bbedda7c4fbf7092c39b0c06b56cb238e15d7 (patch) | |
| tree | 5ded2ec68835504c3f10fcec732b80b7a2bc3f08 /src/bin/psql/command.c | |
| parent | 839c2520a7937b8895ff84fc8fc718dbfab5e72e (diff) | |
| download | postgresql-2d0bbedda7c4fbf7092c39b0c06b56cb238e15d7.tar.gz postgresql-2d0bbedda7c4fbf7092c39b0c06b56cb238e15d7.zip | |
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
Diffstat (limited to 'src/bin/psql/command.c')
| -rw-r--r-- | src/bin/psql/command.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index a141146e706..ab613dd49e0 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -3552,27 +3552,27 @@ do_connect(enum trivalue reuse_previous_specification, param_is_newly_set(PQhost(o_conn), PQhost(pset.db)) || param_is_newly_set(PQport(o_conn), PQport(pset.db))) { - char *host = PQhost(pset.db); + char *connhost = PQhost(pset.db); char *hostaddr = PQhostaddr(pset.db); - if (is_unixsock_path(host)) + if (is_unixsock_path(connhost)) { - /* hostaddr overrides host */ + /* hostaddr overrides connhost */ if (hostaddr && *hostaddr) printf(_("You are now connected to database \"%s\" as user \"%s\" on address \"%s\" at port \"%s\".\n"), PQdb(pset.db), PQuser(pset.db), hostaddr, PQport(pset.db)); else printf(_("You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" at port \"%s\".\n"), - PQdb(pset.db), PQuser(pset.db), host, PQport(pset.db)); + PQdb(pset.db), PQuser(pset.db), connhost, PQport(pset.db)); } else { - if (hostaddr && *hostaddr && strcmp(host, hostaddr) != 0) + if (hostaddr && *hostaddr && strcmp(connhost, hostaddr) != 0) printf(_("You are now connected to database \"%s\" as user \"%s\" on host \"%s\" (address \"%s\") at port \"%s\".\n"), - PQdb(pset.db), PQuser(pset.db), host, hostaddr, PQport(pset.db)); + PQdb(pset.db), PQuser(pset.db), connhost, hostaddr, PQport(pset.db)); else printf(_("You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at port \"%s\".\n"), - PQdb(pset.db), PQuser(pset.db), host, PQport(pset.db)); + PQdb(pset.db), PQuser(pset.db), connhost, PQport(pset.db)); } } else |