Index: src/bin/psql/prompt.c
===================================================================
RCS file: /projects/cvsroot/pgsql/src/bin/psql/prompt.c,v
retrieving revision 1.43
diff -u -r1.43 prompt.c
--- src/bin/psql/prompt.c	5 Mar 2006 15:58:52 -0000	1.43
+++ src/bin/psql/prompt.c	19 Apr 2006 11:58:37 -0000
@@ -256,8 +256,7 @@
 
 						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);
Index: src/bin/pg_dump/pg_backup_archiver.c
===================================================================
RCS file: /projects/cvsroot/pgsql/src/bin/pg_dump/pg_backup_archiver.c,v
retrieving revision 1.126
diff -u -r1.126 pg_backup_archiver.c
--- src/bin/pg_dump/pg_backup_archiver.c	12 Apr 2006 22:18:48 -0000	1.126
+++ src/bin/pg_dump/pg_backup_archiver.c	19 Apr 2006 11:58:37 -0000
@@ -2130,8 +2130,7 @@
 	AH->currUser = strdup("");
 
 	/* don't assume we still know the output schema */
-	if (AH->currSchema)
-		free(AH->currSchema);
+	free(AH->currSchema);
 	AH->currSchema = strdup("");
 	AH->currWithOids = -1;
 
@@ -2229,8 +2228,7 @@
 	else
 		ahprintf(AH, "%s;\n\n", qry->data);
 
-	if (AH->currSchema)
-		free(AH->currSchema);
+	free(AH->currSchema);
 	AH->currSchema = strdup(schemaName);
 
 	destroyPQExpBuffer(qry);