Fix a couple of rather-pointless-but-easily-fixed Coverity warnings.

tglsfdc · tglsfdc · commit 3224f2ee250c · 2006-04-19T16:02:17.000Z
Per Martijn van Oosterhout.
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.126 2006/04/12 22:18:48 tgl Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.127 2006/04/19 16:02:17 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2203,7 +2203,7 @@ _selectOutputSchema(ArchiveHandle *AH, const char *schemaName)
 	PQExpBuffer qry;
 
 	if (!schemaName || *schemaName == '\0' ||
-		strcmp(AH->currSchema, schemaName) == 0)
+		(AH->currSchema && strcmp(AH->currSchema, schemaName) == 0))
 		return;					/* no need to do anything */
 
 	qry = createPQExpBuffer();
diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2006, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/prompt.c,v 1.43 2006/03/05 15:58:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/prompt.c,v 1.44 2006/04/19 16:02:17 tgl Exp $
  */
 #include "postgres_fe.h"
 #include "prompt.h"
@@ -250,14 +250,13 @@ get_prompt(promptStatus_t status)
 					/* execute command */
 				case '`':
 					{
-						FILE	   *fd = NULL;
+						FILE	   *fd;
 						char	   *file = pg_strdup(p + 1);
 						int			cmdend;
 
 						cmdend = strcspn(file, "`");
 						file[cmdend] = '\0';
-						if (file)
-							fd = popen(file, "r");
+						fd = popen(file, "r");
 						if (fd)
 						{
 							fgets(buf, MAX_PROMPT_SIZE - 1, fd);

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*`
`17`	`17`	`* IDENTIFICATION`
`18`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.126 2006/04/12 22:18:48 tgl Exp $`
	`18`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.127 2006/04/19 16:02:17 tgl Exp $`
`19`	`19`	`*`
`20`	`20`	`*-------------------------------------------------------------------------`
`21`	`21`	`*/`
`@@ -2203,7 +2203,7 @@ _selectOutputSchema(ArchiveHandle AH, const char schemaName)`
`2203`	`2203`	`PQExpBuffer qry;`
`2204`	`2204`
`2205`	`2205`	`if (!schemaName \|\| *schemaName == '\0' \|\|`
`2206`		`- strcmp(AH->currSchema, schemaName) == 0)`
	`2206`	`+ (AH->currSchema && strcmp(AH->currSchema, schemaName) == 0))`
`2207`	`2207`	`return; /* no need to do anything */`
`2208`	`2208`
`2209`	`2209`	`qry = createPQExpBuffer();`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2006, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/prompt.c,v 1.43 2006/03/05 15:58:52 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/prompt.c,v 1.44 2006/04/19 16:02:17 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`	`#include "prompt.h"`
`@@ -250,14 +250,13 @@ get_prompt(promptStatus_t status)`
`250`	`250`	`/* execute command */`
`251`	`251`	case '`':
`252`	`252`	`{`
`253`		`- FILE *fd = NULL;`
	`253`	`+ FILE *fd;`
`254`	`254`	`char *file = pg_strdup(p + 1);`
`255`	`255`	`int cmdend;`
`256`	`256`
`257`	`257`	cmdend = strcspn(file, "`");
`258`	`258`	`file[cmdend] = '\0';`
`259`		`- if (file)`
`260`		`- fd = popen(file, "r");`
	`259`	`+ fd = popen(file, "r");`
`261`	`260`	`if (fd)`
`262`	`261`	`{`
`263`	`262`	`fgets(buf, MAX_PROMPT_SIZE - 1, fd);`