Fix: lttng remove-trigger -h fails
authorOlivier Dion <odion@efficios.com>
Wed, 22 Feb 2023 21:45:27 +0000 (16:45 -0500)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Wed, 31 May 2023 21:24:18 +0000 (17:24 -0400)
The error was that `argv' was incremented before passing it to
`argpar_iter_create'. However, the macro `SHOW_HELP' implicitly
deferences `argv[0]' to determine the command name.

Fix this by introducing a new variable `args' leaving `argv' untouched.

Change-Id: Id50fa2424550280a1e5e207429d643f5e8e00396
Signed-off-by: Olivier Dion <odion@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
src/bin/lttng/commands/remove_trigger.c

index 48b91bf486f9f27546e97075fae62e800a7c1376..439ae4a3a35cdf1ca03298e0163e16d29d42708d 100644 (file)
@@ -73,6 +73,7 @@ int cmd_remove_trigger(int argc, const char **argv)
        char *owner_uid = NULL;
        long long uid;
        struct mi_writer *mi_writer = NULL;
+       const char **args;
 
        if (lttng_opt_mi) {
                mi_writer = mi_lttng_writer_create(
@@ -99,10 +100,9 @@ int cmd_remove_trigger(int argc, const char **argv)
                }
        }
 
-       argc--;
-       argv++;
+       args = argv + 1;
 
-       argpar_iter = argpar_iter_create(argc, argv, remove_trigger_options);
+       argpar_iter = argpar_iter_create(argc - 1, args, remove_trigger_options);
        if (!argpar_iter) {
                ERR("Failed to allocate an argpar iter.");
                goto error;
@@ -111,8 +111,8 @@ int cmd_remove_trigger(int argc, const char **argv)
        while (true) {
                enum parse_next_item_status status;
 
-               status = parse_next_item(argpar_iter, &argpar_item, 1, argv,
-                       true, NULL, NULL);
+               status = parse_next_item(argpar_iter, &argpar_item, 1, args,
+                               true, NULL, NULL);
                if (status == PARSE_NEXT_ITEM_STATUS_ERROR ||
                                status == PARSE_NEXT_ITEM_STATUS_ERROR_MEMORY) {
                        goto error;
This page took 0.025516 seconds and 4 git commands to generate.