From b938f102064dc5e79cf32fb0391e8d093183952d Mon Sep 17 00:00:00 2001 From: Ian Barwick Date: Mon, 13 May 2019 15:45:34 +0900 Subject: [PATCH] repmgr client: mark some options as deprecated --- repmgr-client.h | 97 +++++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/repmgr-client.h b/repmgr-client.h index 10d09fac..b2f9ee9a 100644 --- a/repmgr-client.h +++ b/repmgr-client.h @@ -54,59 +54,60 @@ /* command line options without short versions */ #define OPT_HELP 1001 -#define OPT_CHECK_UPSTREAM_CONFIG 1002 -#define OPT_COPY_EXTERNAL_CONFIG_FILES 1003 -#define OPT_CSV 1004 -#define OPT_NODE 1005 -#define OPT_NODE_ID 1006 -#define OPT_NODE_NAME 1007 -#define OPT_WITHOUT_BARMAN 1008 -#define OPT_NO_UPSTREAM_CONNECTION 1009 -#define OPT_WAIT_SYNC 1010 -#define OPT_LOG_TO_FILE 1011 -#define OPT_UPSTREAM_CONNINFO 1012 -#define OPT_REPLICATION_USER 1013 -#define OPT_EVENT 1014 -#define OPT_LIMIT 1015 -#define OPT_ALL 1016 -#define OPT_DRY_RUN 1017 -#define OPT_UPSTREAM_NODE_ID 1018 -#define OPT_ACTION 1019 -#define OPT_LIST_ACTIONS 1020 -#define OPT_CHECKPOINT 1021 -#define OPT_IS_SHUTDOWN_CLEANLY 1022 -#define OPT_ALWAYS_PROMOTE 1023 -#define OPT_FORCE_REWIND 1024 -#define OPT_NAGIOS 1025 -#define OPT_ARCHIVE_READY 1026 -#define OPT_OPTFORMAT 1027 -#define OPT_REPLICATION_LAG 1028 -#define OPT_CONFIG_FILES 1029 -#define OPT_SIBLINGS_FOLLOW 1030 -#define OPT_ROLE 1031 -#define OPT_DOWNSTREAM 1032 -#define OPT_SLOTS 1033 -#define OPT_CONFIG_ARCHIVE_DIR 1034 -#define OPT_HAS_PASSFILE 1035 -#define OPT_WAIT_START 1036 -#define OPT_REPL_CONN 1037 -#define OPT_REMOTE_NODE_ID 1038 -#define OPT_RECOVERY_CONF_ONLY 1039 -#define OPT_NO_WAIT 1040 -#define OPT_MISSING_SLOTS 1041 -#define OPT_REPMGRD_NO_PAUSE 1042 -#define OPT_VERSION_NUMBER 1043 -#define OPT_DATA_DIRECTORY_CONFIG 1044 -#define OPT_COMPACT 1045 -#define OPT_DISABLE_WAL_RECEIVER 1046 -#define OPT_ENABLE_WAL_RECEIVER 1047 -#define OPT_DETAIL 1048 -#define OPT_REPMGRD_FORCE_UNPAUSE 1049 +#define OPT_COPY_EXTERNAL_CONFIG_FILES 1002 +#define OPT_CSV 1003 +#define OPT_NODE_ID 1004 +#define OPT_NODE_NAME 1005 +#define OPT_WITHOUT_BARMAN 1006 +#define OPT_NO_UPSTREAM_CONNECTION 1007 +#define OPT_WAIT_SYNC 1008 +#define OPT_LOG_TO_FILE 1009 +#define OPT_UPSTREAM_CONNINFO 1010 +#define OPT_REPLICATION_USER 1011 +#define OPT_EVENT 1012 +#define OPT_LIMIT 1013 +#define OPT_ALL 1014 +#define OPT_DRY_RUN 1015 +#define OPT_UPSTREAM_NODE_ID 1016 +#define OPT_ACTION 1017 +#define OPT_LIST_ACTIONS 1018 +#define OPT_CHECKPOINT 1019 +#define OPT_IS_SHUTDOWN_CLEANLY 1020 +#define OPT_ALWAYS_PROMOTE 1021 +#define OPT_FORCE_REWIND 1022 +#define OPT_NAGIOS 1023 +#define OPT_ARCHIVE_READY 1024 +#define OPT_OPTFORMAT 1025 +#define OPT_REPLICATION_LAG 1026 +#define OPT_CONFIG_FILES 1027 +#define OPT_SIBLINGS_FOLLOW 1028 +#define OPT_ROLE 1029 +#define OPT_DOWNSTREAM 1030 +#define OPT_SLOTS 1031 +#define OPT_CONFIG_ARCHIVE_DIR 1032 +#define OPT_HAS_PASSFILE 1033 +#define OPT_WAIT_START 1034 +#define OPT_REPL_CONN 1035 +#define OPT_REMOTE_NODE_ID 1036 +#define OPT_RECOVERY_CONF_ONLY 1037 +#define OPT_NO_WAIT 1038 +#define OPT_MISSING_SLOTS 1039 +#define OPT_REPMGRD_NO_PAUSE 1040 +#define OPT_VERSION_NUMBER 1041 +#define OPT_DATA_DIRECTORY_CONFIG 1042 +#define OPT_COMPACT 1043 +#define OPT_DISABLE_WAL_RECEIVER 1044 +#define OPT_ENABLE_WAL_RECEIVER 1045 +#define OPT_DETAIL 1046 +#define OPT_REPMGRD_FORCE_UNPAUSE 1047 /* deprecated since 3.3 */ #define OPT_DATA_DIR 999 #define OPT_NO_CONNINFO_PASSWORD 998 #define OPT_RECOVERY_MIN_APPLY_DELAY 997 +/* deprecated since 4.0 */ +#define OPT_CHECK_UPSTREAM_CONFIG 996 +#define OPT_NODE 995 static struct option long_options[] =