Add a warning comment that options and their enums should be in sync

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

4 files changed, 11 insertions, 18 deletions

diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp
index 97cafe82..b8c23edd 100644
--- a/src/daemon/Daemon.cpp
+++ b/src/daemon/Daemon.cpp
@@ -858,17 +858,15 @@ static void sanitize_dump_dir_rights()
     ensure_writable_dir(VAR_RUN"/abrt", 0755, "root");
 }
 
+static char *timeout_opt;
+static const char* abrtd_usage = _("abrtd [options]");
 enum {
     OPT_v = 1 << 0,
     OPT_d = 1 << 1,
     OPT_s = 1 << 2,
     OPT_t = 1 << 3,
 };
-
-static char *timeout_opt;
-
-static const char* abrtd_usage = _("abrtd [options]");
-
+/* Keep enum above and order of options below in sync! */
 static struct options abrtd_options[] = {
     OPT__VERBOSE(&g_verbose),
     OPT_BOOL( 'd' , 0, NULL, _("Do not daemonize")),
diff --git a/src/daemon/abrt-action-generate-backtrace.c b/src/daemon/abrt-action-generate-backtrace.c
index d07562d2..b87c7c9e 100644
--- a/src/daemon/abrt-action-generate-backtrace.c
+++ b/src/daemon/abrt-action-generate-backtrace.c
@@ -240,6 +240,8 @@ static char *get_backtrace(struct dump_dir *dd)
     return bt;
 }
 
+static char *i_opt;
+static const char abrt_action_generage_backtrace_usage[] = "abrt-action-generate-backtrace [options] -d DIR";
 enum {
     OPT_v = 1 << 0,
     OPT_d = 1 << 1,
@@ -247,11 +249,7 @@ enum {
     OPT_t = 1 << 3,
     OPT_s = 1 << 4,
 };
-
-static char *i_opt;
-
-static const char abrt_action_generage_backtrace_usage[] = "abrt-action-generate-backtrace [options] -d DIR";
-
+/* Keep enum above and order of options below in sync! */
 static struct options abrt_action_generate_backtrace_options[] = {
     OPT__VERBOSE(&g_verbose),
     OPT_STRING( 'd' , 0, &dump_dir_name, "dir", "Crash dump directory"),
diff --git a/src/daemon/abrt-action-save-package-data.cpp b/src/daemon/abrt-action-save-package-data.cpp
index 1c2f6051..9dbddac4 100644
--- a/src/daemon/abrt-action-save-package-data.cpp
+++ b/src/daemon/abrt-action-save-package-data.cpp
@@ -267,16 +267,14 @@ static int SavePackageDescriptionToDebugDump(const char *dump_dir_name)
     return error;
 }
 
+static const char *dump_dir_name = ".";
+static const char abrt_action_save_package_data_usage[] = "abrt-action-save-package-data [options] -d DIR";
 enum {
     OPT_v = 1 << 0,
     OPT_d = 1 << 1,
     OPT_s = 1 << 2,
 };
-
-static const char *dump_dir_name = ".";
-
-static const char abrt_action_save_package_data_usage[] = "abrt-action-save-package-data [options] -d DIR";
-
+/* Keep enum above and order of options below in sync! */
 static struct options abrt_action_save_package_data_options[] = {
     OPT__VERBOSE(&g_verbose),
     OPT_STRING( 'd' , 0, &dump_dir_name, "dir", "Crash dump directory"),
diff --git a/src/daemon/abrt-server.c b/src/daemon/abrt-server.c
index 4da0fc58..231fc0bd 100644
--- a/src/daemon/abrt-server.c
+++ b/src/daemon/abrt-server.c
@@ -277,14 +277,13 @@ static void process_message(const char *message)
 
 static void dummy_handler(int sig_unused) {}
 
+static const char abrt_server_usage[] = "abrt-server [options]";
 enum {
     OPT_v = 1 << 0,
     OPT_u = 1 << 1,
     OPT_s = 1 << 2,
 };
-
-static const char abrt_server_usage[] = "abrt-server [options]";
-
+/* Keep enum above and order of options below in sync! */
 static struct options abrt_server_options[] = {
     OPT__VERBOSE(&g_verbose),
     OPT_INTEGER( 'u' , 0, &client_uid, "Use UID as client uid"),