From 2f80c95740f88e9e3e04ee0c2063e55a497315b4 Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Thu, 2 Mar 2023 14:36:37 +0100 Subject: [PATCH] Mark options as deprecated in usage output Some deprecated options were not marked as such in usage output. This does so across the installed binaries in an attempt to provide consistent markup for this. Reviewed-by: Heikki Linnakangas Discussion: https://postgr.es/m/062C6A8A-A4E8-4F52-9E31-45F0C9E9915E@yesql.se --- contrib/oid2name/oid2name.c | 2 +- src/backend/main/main.c | 2 +- src/bin/pg_dump/pg_dump.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c index 4edf02d9c7..e8c1e2c97b 100644 --- a/contrib/oid2name/oid2name.c +++ b/contrib/oid2name/oid2name.c @@ -217,7 +217,7 @@ help(const char *progname) "\nConnection options:\n" " -d, --dbname=DBNAME database to connect to\n" " -h, --host=HOSTNAME database server host or socket directory\n" - " -H same as -h, deprecated option\n" + " -H (same as -h, deprecated)\n" " -p, --port=PORT database server port number\n" " -U, --username=USERNAME connect as specified database user\n" "\nThe default action is to show all database OIDs.\n\n" diff --git a/src/backend/main/main.c b/src/backend/main/main.c index 96347eca1a..43978fd359 100644 --- a/src/backend/main/main.c +++ b/src/backend/main/main.c @@ -339,7 +339,7 @@ help(const char *progname) printf(_(" -e use European date input format (DMY)\n")); printf(_(" -F turn fsync off\n")); printf(_(" -h HOSTNAME host name or IP address to listen on\n")); - printf(_(" -i enable TCP/IP connections\n")); + printf(_(" -i enable TCP/IP connections (deprecated)\n")); printf(_(" -k DIRECTORY Unix-domain socket location\n")); #ifdef USE_SSL printf(_(" -l enable SSL connections\n")); diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 655d39a81b..74d806c77b 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -1037,10 +1037,10 @@ help(const char *progname) printf(_("\nOptions controlling the output content:\n")); printf(_(" -a, --data-only dump only the data, not the schema\n")); - printf(_(" -b, --large-objects, --blobs\n" - " include large objects in dump\n")); - printf(_(" -B, --no-large-objects, --no-blobs\n" - " exclude large objects in dump\n")); + printf(_(" -b, --large-objects include large objects in dump\n" + " --blobs (same as --large-objects, deprecated)\n")); + printf(_(" -B, --no-large-objects exclude large objects in dump\n" + " --no-blobs (same as --no-large-objects, deprecated)\n")); printf(_(" -c, --clean clean (drop) database objects before recreating\n")); printf(_(" -C, --create include commands to create database in dump\n")); printf(_(" -e, --extension=PATTERN dump the specified extension(s) only\n"));