From 876f1e6805c34bb87525583e524e3445a33c215b Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Tue, 12 Aug 2014 11:12:16 +0200 Subject: [PATCH] pg_recvlogical message and code improvements. 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 --- src/bin/pg_basebackup/pg_recvlogical.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c index dbc002d18e..f3b0f34fce 100644 --- 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);