projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: wrong error check on kernel session creation
[lttng-tools.git]
/
src
/
bin
/
lttng
/
commands
/
destroy.c
diff --git
a/src/bin/lttng/commands/destroy.c
b/src/bin/lttng/commands/destroy.c
index e0bafc475b6451cd4e3d0c8cd6b79583609936f4..6878aaa0da20a146808592b54d89efcfabd56977 100644
(file)
--- a/
src/bin/lttng/commands/destroy.c
+++ b/
src/bin/lttng/commands/destroy.c
@@
-35,6
+35,12
@@
static char *opt_session_name;
static int opt_destroy_all;
static int opt_no_wait;
static int opt_destroy_all;
static int opt_no_wait;
+#ifdef LTTNG_EMBED_HELP
+static const char help_msg[] =
+#include <lttng-destroy.1.h>
+;
+#endif
+
/* Mi writer */
static struct mi_writer *writer;
/* Mi writer */
static struct mi_writer *writer;
@@
-168,6
+174,7
@@
int cmd_destroy(int argc, const char **argv)
int ret = CMD_SUCCESS , i, command_ret = CMD_SUCCESS, success = 1;
static poptContext pc;
char *session_name = NULL;
int ret = CMD_SUCCESS , i, command_ret = CMD_SUCCESS, success = 1;
static poptContext pc;
char *session_name = NULL;
+ const char *leftover = NULL;
struct lttng_session *sessions;
int count;
struct lttng_session *sessions;
int count;
@@
-226,7
+233,8
@@
int cmd_destroy(int argc, const char **argv)
/* Recuperate all sessions for further operation */
count = lttng_list_sessions(&sessions);
if (count < 0) {
/* Recuperate all sessions for further operation */
count = lttng_list_sessions(&sessions);
if (count < 0) {
- command_ret = count;
+ ERR("%s", lttng_strerror(count));
+ command_ret = CMD_ERROR;
success = 0;
goto mi_closing;
}
success = 0;
goto mi_closing;
}
@@
-273,6
+281,14
@@
int cmd_destroy(int argc, const char **argv)
}
}
}
}
+ leftover = poptGetArg(pc);
+ if (leftover) {
+ ERR("Unknown argument: %s", leftover);
+ ret = CMD_ERROR;
+ success = 0;
+ goto mi_closing;
+ }
+
mi_closing:
/* Mi closing */
if (lttng_opt_mi) {
mi_closing:
/* Mi closing */
if (lttng_opt_mi) {
This page took
0.038165 seconds
and
4
git commands to generate.