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-list: don't warn when the kernel domain has no channels
[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 28166c8be28e5a9588d14d8f14adfd56a39810dd..8f44b6a77300ce77391930cb5668615699c80fe1 100644
(file)
--- a/
src/bin/lttng/commands/list.c
+++ b/
src/bin/lttng/commands/list.c
@@
-1452,7
+1452,6
@@
static int list_channels(const char *channel_name)
count = 0;
} else {
ret = CMD_SUCCESS;
count = 0;
} else {
ret = CMD_SUCCESS;
- WARN("No kernel channel");
goto error_channels;
}
break;
goto error_channels;
}
break;
@@
-1825,7
+1824,7
@@
static int list_sessions(const char *session_name)
int ret = CMD_SUCCESS;
int count, i;
unsigned int session_found = 0;
int ret = CMD_SUCCESS;
int count, i;
unsigned int session_found = 0;
- struct lttng_session *sessions;
+ struct lttng_session *sessions
= NULL
;
count = lttng_list_sessions(&sessions);
DBG("Session count %d", count);
count = lttng_list_sessions(&sessions);
DBG("Session count %d", count);
@@
-1838,7
+1837,7
@@
static int list_sessions(const char *session_name)
if (lttng_opt_mi) {
/* Mi */
if (session_name == NULL) {
if (lttng_opt_mi) {
/* Mi */
if (session_name == NULL) {
- /* List all session */
+ /* List all session
s
*/
ret = mi_list_sessions(sessions, count);
} else {
/* Note : this return an open session element */
ret = mi_list_sessions(sessions, count);
} else {
/* Note : this return an open session element */
@@
-1846,7
+1845,7
@@
static int list_sessions(const char *session_name)
}
if (ret) {
ret = CMD_ERROR;
}
if (ret) {
ret = CMD_ERROR;
- goto e
rror
;
+ goto e
nd
;
}
} else {
/* Pretty print */
}
} else {
/* Pretty print */
@@
-1893,7
+1892,7
@@
static int list_sessions(const char *session_name)
if (!session_found && session_name != NULL) {
ERR("Session '%s' not found", session_name);
ret = CMD_ERROR;
if (!session_found && session_name != NULL) {
ERR("Session '%s' not found", session_name);
ret = CMD_ERROR;
- goto e
rror
;
+ goto e
nd
;
}
if (session_name == NULL) {
}
if (session_name == NULL) {
@@
-1901,9
+1900,8
@@
static int list_sessions(const char *session_name)
}
}
}
}
-error:
- free(sessions);
end:
end:
+ free(sessions);
return ret;
}
return ret;
}
This page took
0.025805 seconds
and
4
git commands to generate.