pg_recvlogical message and code improvements.

anarazel · anarazel · commit 596385be06e1 · 2014-08-12T13:06:34.000+02:00
Some error messages complained about --init and --stop being used
whereas the --create and --drop are the correct verbs. Fix that.

Also a XLogRecPtr was tested in a boolean fashion instead of being
compared to InvalidXLogRecPtr.

Backpatch to 9.4 where pg_recvlogical was introduced.

Michael Paquier
diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -814,15 +814,15 @@ main(int argc, char **argv)
 
 	if (do_drop_slot && (do_create_slot || do_start_slot))
 	{
-		fprintf(stderr, _("%s: cannot use --init or --start together with --stop\n"), progname);
+		fprintf(stderr, _("%s: cannot use --create or --start together with --drop\n"), progname);
 		fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
 				progname);
 		exit(1);
 	}
 
-	if (startpos && (do_create_slot || do_drop_slot))
+	if (startpos != InvalidXLogRecPtr && (do_create_slot || do_drop_slot))
 	{
-		fprintf(stderr, _("%s: cannot use --init or --stop together with --startpos\n"), progname);
+		fprintf(stderr, _("%s: cannot use --create or --drop together with --startpos\n"), progname);
 		fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
 				progname);
 		exit(1);

Original file line number	Diff line number	Diff line change
`@@ -814,15 +814,15 @@ main(int argc, char **argv)`
`814`	`814`
`815`	`815`	`if (do_drop_slot && (do_create_slot \|\| do_start_slot))`
`816`	`816`	`{`
`817`		`- fprintf(stderr, _("%s: cannot use --init or --start together with --stop\n"), progname);`
	`817`	`+ fprintf(stderr, _("%s: cannot use --create or --start together with --drop\n"), progname);`
`818`	`818`	`fprintf(stderr, _("Try \"%s --help\" for more information.\n"),`
`819`	`819`	`progname);`
`820`	`820`	`exit(1);`
`821`	`821`	`}`
`822`	`822`
`823`		`- if (startpos && (do_create_slot \|\| do_drop_slot))`
	`823`	`+ if (startpos != InvalidXLogRecPtr && (do_create_slot \|\| do_drop_slot))`
`824`	`824`	`{`
`825`		`- fprintf(stderr, _("%s: cannot use --init or --stop together with --startpos\n"), progname);`
	`825`	`+ fprintf(stderr, _("%s: cannot use --create or --drop together with --startpos\n"), progname);`
`826`	`826`	`fprintf(stderr, _("Try \"%s --help\" for more information.\n"),`
`827`	`827`	`progname);`
`828`	`828`	`exit(1);`