mirrors
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded variable test, per Tom.

This commit is contained in:
Bruce Momjian 2005-06-10 04:01:36 +00:00
parent a87ee007ed
commit c1e4869467
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/interfaces/libpq/fe-connect.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.308 2005/06/10 03:02:30 momjian Exp $ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.309 2005/06/10 04:01:36 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -3237,22 +3237,15 @@ PasswordFromFile(char *hostname, char *port, char *dbname, char *username)
port = DEF_PGPORT_STR; port = DEF_PGPORT_STR;
if ((passfile_env = getenv("PGPASSFILE")) != NULL) if ((passfile_env = getenv("PGPASSFILE")) != NULL)
{
/* use the literal path from the environment, if set */ /* use the literal path from the environment, if set */
StrNCpy(pgpassfile, passfile_env, MAXPGPATH); StrNCpy(pgpassfile, passfile_env, MAXPGPATH);
if (!pgpassfile)
{
fprintf(stderr, libpq_gettext("out of memory\n"));
return NULL;
}
}
else else
{ {
char homedir[MAXPGPATH]; char homedir[MAXPGPATH];
if (!pqGetHomeDirectory(homedir, sizeof(homedir))) if (!pqGetHomeDirectory(homedir, sizeof(homedir)))
return NULL; return NULL;
snprintf(pgpassfile, sizeof(pgpassfile), "%s/%s", homedir, PGPASSFILE); snprintf(pgpassfile, MAXPGPATH, "%s/%s", homedir, PGPASSFILE);
} }
/* If password file cannot be opened, ignore it. */ /* If password file cannot be opened, ignore it. */