X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fhelp.cpp;fp=src%2Fbin%2Flttng%2Fcommands%2Fhelp.cpp;h=9822b47eb90b0e5cf0e7eb940f4a04fa458a64ba;hp=74b64964443aa184eb8ac7762491f4cac2e37037;hb=5b915816f16e7cb3134dd7279abad79b31c2486c;hpb=3957512ed31ca945f8353d5812f317314c905640 diff --git a/src/bin/lttng/commands/help.cpp b/src/bin/lttng/commands/help.cpp index 74b649644..9822b47eb 100644 --- a/src/bin/lttng/commands/help.cpp +++ b/src/bin/lttng/commands/help.cpp @@ -46,7 +46,7 @@ static struct poptOption long_options[] = { int cmd_help(int argc, const char **argv, const struct cmd_struct commands[]) { int opt, ret = CMD_SUCCESS; - char *cmd_name; + const char *arg_cmd_name; static poptContext pc; const struct cmd_struct *cmd; int found = 0; @@ -70,9 +70,8 @@ int cmd_help(int argc, const char **argv, const struct cmd_struct commands[]) } /* Get command name */ - cmd_name = (char *) poptGetArg(pc); - - if (cmd_name == NULL) { + arg_cmd_name = poptGetArg(pc); + if (arg_cmd_name == NULL) { /* Fall back to lttng(1) */ ret = utils_show_help(1, "lttng", lttng_help_msg); if (ret) { @@ -85,7 +84,7 @@ int cmd_help(int argc, const char **argv, const struct cmd_struct commands[]) } /* Help about help? */ - if (strcmp(cmd_name, "help") == 0) { + if (strcmp(arg_cmd_name, "help") == 0) { SHOW_HELP(); goto end; } @@ -94,7 +93,7 @@ int cmd_help(int argc, const char **argv, const struct cmd_struct commands[]) cmd = &commands[0]; while (cmd->name != NULL) { - if (strcmp(cmd->name, cmd_name) == 0) { + if (strcmp(cmd->name, arg_cmd_name) == 0) { found = 1; break; } @@ -103,7 +102,7 @@ int cmd_help(int argc, const char **argv, const struct cmd_struct commands[]) } if (!found) { - ERR("Unknown command \"%s\"", cmd_name); + ERR("Unknown command \"%s\"", arg_cmd_name); ret = CMD_ERROR; goto end; }