Fix: incorrect error message on regenerate missing argument
authorJérémie Galarneau <jeremie.galarneau@efficios.com>
Thu, 30 Aug 2018 18:49:29 +0000 (14:49 -0400)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Thu, 30 Aug 2018 18:49:29 +0000 (14:49 -0400)
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
src/bin/lttng/commands/regenerate.c

index 298312bba6ab01ac1ca3309bd7c743b932fc613c..c53df249285dcd7b5f7010baff0fc35f3e604ce5 100644 (file)
@@ -84,12 +84,14 @@ static int regenerate_metadata(int argc, const char **argv)
        int ret;
 
        if (argc > 1) {
-               ret = -LTTNG_ERR_INVALID;
+               ret = CMD_UNDEFINED;
                goto end;
        }
        ret = lttng_regenerate_metadata(session_name);
        if (ret == 0) {
                MSG("Metadata successfully regenerated for session %s", session_name);
+       } else {
+               ERR("%s", lttng_strerror(ret));
        }
 
 end:
@@ -119,7 +121,7 @@ static int handle_command(const char **argv)
        int ret = CMD_SUCCESS, i = 0, argc, command_ret = CMD_SUCCESS;
 
        if (argv == NULL) {
-               ERR("argv is null");
+               ERR("No object specified for regenerate command.");
                command_ret = CMD_ERROR;
                goto end;
        }
@@ -240,12 +242,7 @@ int cmd_regenerate(int argc, const char **argv)
 
        command_ret = handle_command(poptGetArgs(pc));
        if (command_ret) {
-               switch (-command_ret) {
-               default:
-                       ERR("%s", lttng_strerror(command_ret));
-                       success = 0;
-                       break;
-               }
+               success = 0;
        }
 
        if (lttng_opt_mi) {
This page took 0.034599 seconds and 4 git commands to generate.