Shorten option names

Replace `CLI_OPTION_ID_` prefix with `CLI_OPT_`, matching the variable
`opt`.

Signed-off-by: Nir Soffer <[email protected]>

Author: nirs

cli.c

@@ -64,14 +64,14 @@ static void print_usage(const char *argv0) {
 static void print_version() { puts(VERSION); }
 
 enum {
-    CLI_OPTIONS_ID_SOCKET_GROUP = CHAR_MAX + 1,
-    CLI_OPTIONS_ID_VMNET_MODE,
-    CLI_OPTIONS_ID_VMNET_INTERFACE,
-    CLI_OPTIONS_ID_VMNET_GATEWAY,
-    CLI_OPTIONS_ID_VMNET_DHCP_END,
-    CLI_OPTIONS_ID_VMNET_MASK,
-    CLI_OPTIONS_ID_VMNET_INTERFACE_ID,
-    CLI_OPTIONS_ID_VMNET_NAT66_PREFIX,
+    CLI_OPT_SOCKET_GROUP = CHAR_MAX + 1,
+    CLI_OPT_VMNET_MODE,
+    CLI_OPT_VMNET_INTERFACE,
+    CLI_OPT_VMNET_GATEWAY,
+    CLI_OPT_VMNET_DHCP_END,
+    CLI_OPT_VMNET_MASK,
+    CLI_OPT_VMNET_INTERFACE_ID,
+    CLI_OPT_VMNET_NAT66_PREFIX,
 };
 
 struct cli_options *cli_options_parse(int argc, char *argv[]) {
@@ -82,18 +82,18 @@ struct cli_options *cli_options_parse(int argc, char *argv[]) {
   }
 
   const struct option longopts[] = {
-      {"socket-group", required_argument, NULL, CLI_OPTIONS_ID_SOCKET_GROUP},
-      {"vmnet-mode", required_argument, NULL, CLI_OPTIONS_ID_VMNET_MODE},
+      {"socket-group", required_argument, NULL, CLI_OPT_SOCKET_GROUP},
+      {"vmnet-mode", required_argument, NULL, CLI_OPT_VMNET_MODE},
       {"vmnet-interface", required_argument, NULL,
-       CLI_OPTIONS_ID_VMNET_INTERFACE},
-      {"vmnet-gateway", required_argument, NULL, CLI_OPTIONS_ID_VMNET_GATEWAY},
+       CLI_OPT_VMNET_INTERFACE},
+      {"vmnet-gateway", required_argument, NULL, CLI_OPT_VMNET_GATEWAY},
       {"vmnet-dhcp-end", required_argument, NULL,
-       CLI_OPTIONS_ID_VMNET_DHCP_END},
-      {"vmnet-mask", required_argument, NULL, CLI_OPTIONS_ID_VMNET_MASK},
+       CLI_OPT_VMNET_DHCP_END},
+      {"vmnet-mask", required_argument, NULL, CLI_OPT_VMNET_MASK},
       {"vmnet-interface-id", required_argument, NULL,
-       CLI_OPTIONS_ID_VMNET_INTERFACE_ID},
+       CLI_OPT_VMNET_INTERFACE_ID},
       {"vmnet-nat66-prefix", required_argument, NULL,
-       CLI_OPTIONS_ID_VMNET_NAT66_PREFIX},
+       CLI_OPT_VMNET_NAT66_PREFIX},
       {"pidfile", required_argument, NULL, 'p'},
       {"help", no_argument, NULL, 'h'},
       {"version", no_argument, NULL, 'v'},
@@ -102,10 +102,10 @@ struct cli_options *cli_options_parse(int argc, char *argv[]) {
   int opt = 0;
   while ((opt = getopt_long(argc, argv, "hvp", longopts, NULL)) != -1) {
     switch (opt) {
-    case CLI_OPTIONS_ID_SOCKET_GROUP:
+    case CLI_OPT_SOCKET_GROUP:
       res->socket_group = strdup(optarg);
       break;
-    case CLI_OPTIONS_ID_VMNET_MODE:
+    case CLI_OPT_VMNET_MODE:
       if (strcmp(optarg, "host") == 0) {
         res->vmnet_mode = VMNET_HOST_MODE;
       } else if (strcmp(optarg, "shared") == 0) {
@@ -117,25 +117,25 @@ struct cli_options *cli_options_parse(int argc, char *argv[]) {
         goto error;
       }
       break;
-    case CLI_OPTIONS_ID_VMNET_INTERFACE:
+    case CLI_OPT_VMNET_INTERFACE:
       res->vmnet_interface = strdup(optarg);
       break;
-    case CLI_OPTIONS_ID_VMNET_GATEWAY:
+    case CLI_OPT_VMNET_GATEWAY:
       res->vmnet_gateway = strdup(optarg);
       break;
-    case CLI_OPTIONS_ID_VMNET_DHCP_END:
+    case CLI_OPT_VMNET_DHCP_END:
       res->vmnet_dhcp_end = strdup(optarg);
       break;
-    case CLI_OPTIONS_ID_VMNET_MASK:
+    case CLI_OPT_VMNET_MASK:
       res->vmnet_mask = strdup(optarg);
       break;
-    case CLI_OPTIONS_ID_VMNET_INTERFACE_ID:
+    case CLI_OPT_VMNET_INTERFACE_ID:
       if (uuid_parse(optarg, res->vmnet_interface_id) < 0) {
         fprintf(stderr, "Failed to parse UUID \"%s\"\n", optarg);
         goto error;
       }
       break;
-    case CLI_OPTIONS_ID_VMNET_NAT66_PREFIX:
+    case CLI_OPT_VMNET_NAT66_PREFIX:
       res->vmnet_nat66_prefix = strdup(optarg);
       break;
     case 'p':