projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cppcheck: don't check NULL pointer before freeing them
[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 eced2b7165f1836098e415aad4768c772a581240..8fec91fac30ffe6cab6986ac7e717a75dbf18d36 100644
(file)
--- a/
src/bin/lttng/commands/list.c
+++ b/
src/bin/lttng/commands/list.c
@@
-281,7
+281,7
@@
static void print_event_field(struct lttng_event_field *field)
return;
}
MSG("%sfield: %s (%s)%s", indent8, field->field_name,
return;
}
MSG("%sfield: %s (%s)%s", indent8, field->field_name,
- field_type(field), field->
written ? "" : " [no write]
");
+ field_type(field), field->
nowrite ? " [no write]" : "
");
}
/*
}
/*
@@
-474,9
+474,7
@@
static int list_events(const char *channel_name)
MSG("");
end:
MSG("");
end:
- if (events) {
- free(events);
- }
+ free(events);
ret = CMD_SUCCESS;
error:
ret = CMD_SUCCESS;
error:
@@
-521,11
+519,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
+678,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
+742,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
+753,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
+777,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) {
@@
-812,9
+819,7
@@
int cmd_list(int argc, const char **argv)
}
end:
}
end:
- if (domains) {
- free(domains);
- }
+ free(domains);
if (handle) {
lttng_destroy_handle(handle);
}
if (handle) {
lttng_destroy_handle(handle);
}
This page took
0.025658 seconds
and
4
git commands to generate.