This patch fixes a bug in the error message emitted by pg_restore on an

Neil Conway · Neil Conway · commit 18b5ef5a76f3 · 2005-04-29T07:08:06.000Z
incorrect -F argument: write_msg() expects its first parameter to be a
"module name", not the format string.
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
@@ -34,7 +34,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.69 2005/02/22 04:39:38 momjian Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.70 2005/04/29 07:08:06 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -313,7 +313,7 @@ main(int argc, char **argv)
 				break;
 
 			default:
-				write_msg("unrecognized archive format '%s'; please specify 't' or 'c'\n",
+				write_msg(NULL, "unrecognized archive format '%s'; please specify 't' or 'c'\n",
 						  opts->formatName);
 				exit(1);
 		}

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`*`
`35`	`35`	`*`
`36`	`36`	`* IDENTIFICATION`
`37`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.69 2005/02/22 04:39:38 momjian Exp $`
	`37`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.70 2005/04/29 07:08:06 neilc Exp $`
`38`	`38`	`*`
`39`	`39`	`*-------------------------------------------------------------------------`
`40`	`40`	`*/`
`@@ -313,7 +313,7 @@ main(int argc, char **argv)`
`313`	`313`	`break;`
`314`	`314`
`315`	`315`	`default:`
`316`		`- write_msg("unrecognized archive format '%s'; please specify 't' or 'c'\n",`
	`316`	`+ write_msg(NULL, "unrecognized archive format '%s'; please specify 't' or 'c'\n",`
`317`	`317`	`opts->formatName);`
`318`	`318`	`exit(1);`
`319`	`319`	`}`