projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: lttng create URI parsing and check
[lttng-tools.git]
/
src
/
bin
/
lttng
/
commands
/
list.c
diff --git
a/src/bin/lttng/commands/list.c
b/src/bin/lttng/commands/list.c
index 696e80e7f2c9a8bfd3e54de5c4caba0024e68b84..a6ea6b8c9c6c153375bac25c7b390466b830d01d 100644
(file)
--- a/
src/bin/lttng/commands/list.c
+++ b/
src/bin/lttng/commands/list.c
@@
-521,11
+521,17
@@
static int list_channels(const char *channel_name)
count = lttng_list_channels(handle, &channels);
if (count < 0) {
count = lttng_list_channels(handle, &channels);
if (count < 0) {
- ret = count;
+ switch (-count) {
+ case LTTNG_ERR_KERN_CHAN_NOT_FOUND:
+ ret = CMD_SUCCESS;
+ WARN("No kernel channel");
+ break;
+ default:
+ /* We had a real error */
+ ret = count;
+ ERR("%s", lttng_strerror(ret));
+ }
goto error_channels;
goto error_channels;
- } else if (count == 0) {
- ERR("Channel %s not found", channel_name);
- goto error;
}
if (channel_name == NULL) {
}
if (channel_name == NULL) {
@@
-674,8
+680,7
@@
error:
*/
int cmd_list(int argc, const char **argv)
{
*/
int cmd_list(int argc, const char **argv)
{
- int opt, i, ret = CMD_SUCCESS;
- int nb_domain;
+ int opt, ret = CMD_SUCCESS;
const char *session_name;
static poptContext pc;
struct lttng_domain domain;
const char *session_name;
static poptContext pc;
struct lttng_domain domain;
@@
-739,6
+744,7
@@
int cmd_list(int argc, const char **argv)
if (opt_kernel) {
ret = list_kernel_events();
if (ret < 0) {
if (opt_kernel) {
ret = list_kernel_events();
if (ret < 0) {
+ ret = CMD_ERROR;
goto end;
}
}
goto end;
}
}
@@
-749,6
+755,7
@@
int cmd_list(int argc, const char **argv)
ret = list_ust_events();
}
if (ret < 0) {
ret = list_ust_events();
}
if (ret < 0) {
+ ret = CMD_ERROR;
goto end;
}
}
goto end;
}
}
@@
-772,6
+779,8
@@
int cmd_list(int argc, const char **argv)
goto end;
}
} else {
goto end;
}
} else {
+ int i, nb_domain;
+
/* We want all domain(s) */
nb_domain = lttng_list_domains(session_name, &domains);
if (nb_domain < 0) {
/* We want all domain(s) */
nb_domain = lttng_list_domains(session_name, &domains);
if (nb_domain < 0) {
This page took
0.024215 seconds
and
4
git commands to generate.