From 4a4241e15b246663fc44b5e5355bc6d19c6d2aa6 Mon Sep 17 00:00:00 2001 From: Fujii Masao Date: Thu, 4 Mar 2021 18:23:22 +0900 Subject: [PATCH] Remove redundant getenv() for PGUSER, in psql help. Previously psql obtained the value of PGUSER twice to display a default user in its help message. Author: Kota Miyake Reviewed-by: Nitin Jadhav, Fujii Masao Discussion: https://postgr.es/m/2a3c612babdd6ed63a9d877bb575d793@oss.nttdata.com --- src/bin/psql/help.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index e44120bf76..daa5081eac 100644 --- a/src/bin/psql/help.c +++ b/src/bin/psql/help.c @@ -134,10 +134,7 @@ usage(unsigned short int pager) fprintf(output, _(" -p, --port=PORT database server port (default: \"%s\")\n"), env ? env : DEF_PGPORT_STR); /* Display default user */ - env = getenv("PGUSER"); - if (!env) - env = user; - fprintf(output, _(" -U, --username=USERNAME database user name (default: \"%s\")\n"), env); + fprintf(output, _(" -U, --username=USERNAME database user name (default: \"%s\")\n"), user); fprintf(output, _(" -w, --no-password never prompt for password\n")); fprintf(output, _(" -W, --password force password prompt (should happen automatically)\n"));