Commit4a4241e

committed

Remove redundant getenv() for PGUSER, in psql help.

Previously psql obtained the value of PGUSER twice to displaya default user in its help message.Author: Kota MiyakeReviewed-by: Nitin Jadhav, Fujii MasaoDiscussion:https://postgr.es/m/2a3c612babdd6ed63a9d877bb575d793@oss.nttdata.com

1 parent85d94c5 commit4a4241eCopy full SHA for 4a4241e

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -134,10 +134,7 @@ usage(unsigned short int pager)`
`134`	`134`	`fprintf(output,_(" -p, --port=PORT database server port (default: \"%s\")\n"),`
`135`	`135`	`env ?env :DEF_PGPORT_STR);`
`136`	`136`	`/* Display default user */`
`137`		`-env=getenv("PGUSER");`
`138`		`-if (!env)`
`139`		`-env=user;`
`140`		`-fprintf(output,_(" -U, --username=USERNAME database user name (default: \"%s\")\n"),env);`
	`137`	`+fprintf(output,_(" -U, --username=USERNAME database user name (default: \"%s\")\n"),user);`
`141`	`138`	`fprintf(output,_(" -w, --no-password never prompt for password\n"));`
`142`	`139`	`fprintf(output,_(" -W, --password force password prompt (should happen automatically)\n"));`
`143`	`140`

Comments

(0)