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

Neil Conway · Neil Conway · commit 6dce59ced9d9 · 2005-04-30T08:01:58.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
- *		$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_restore.c,v 1.33 2002/01/18 19:17:05 momjian Exp $
+ *		$Header: /cvsroot/pgsql/src/bin/pg_dump/pg_restore.c,v 1.33.2.1 2005/04/30 08:01:58 neilc Exp $
  *
  * Modifications - 28-Jun-2000 - pjw@rhyme.com.au
  *
@@ -332,7 +332,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`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_restore.c,v 1.33 2002/01/18 19:17:05 momjian Exp $`
	`37`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_restore.c,v 1.33.2.1 2005/04/30 08:01:58 neilc Exp $`
`38`	`38`	`*`
`39`	`39`	`* Modifications - 28-Jun-2000 - pjw@rhyme.com.au`
`40`	`40`	`*`
`@@ -332,7 +332,7 @@ main(int argc, char **argv)`
`332`	`332`	`break;`
`333`	`333`
`334`	`334`	`default:`
`335`		`- write_msg("unrecognized archive format '%s'; please specify 't' or 'c'\n",`
	`335`	`+ write_msg(NULL, "unrecognized archive format '%s'; please specify 't' or 'c'\n",`
`336`	`336`	`opts->formatName);`
`337`	`337`	`exit(1);`
`338`	`338`	`}`