projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Mark libxml2 as a mandatory dependency
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
cmd.c
diff --git
a/src/bin/lttng-sessiond/cmd.c
b/src/bin/lttng-sessiond/cmd.c
index d882b074d54cd4f0348365ab4adb218ce263c48b..17091de09ec66d9bd5b6028bbf04b90c7a99d5ff 100644
(file)
--- a/
src/bin/lttng-sessiond/cmd.c
+++ b/
src/bin/lttng-sessiond/cmd.c
@@
-2388,6
+2388,10
@@
ssize_t cmd_list_domains(struct ltt_session *session,
}
}
}
}
+ if (!nb_dom) {
+ goto end;
+ }
+
*domains = zmalloc(nb_dom * sizeof(struct lttng_domain));
if (*domains == NULL) {
ret = LTTNG_ERR_FATAL;
*domains = zmalloc(nb_dom * sizeof(struct lttng_domain));
if (*domains == NULL) {
ret = LTTNG_ERR_FATAL;
@@
-2413,7
+2417,7
@@
ssize_t cmd_list_domains(struct ltt_session *session,
}
}
}
}
}
}
-
+end:
return nb_dom;
error:
return nb_dom;
error:
@@
-2447,12
+2451,12
@@
ssize_t cmd_list_channels(int domain, struct ltt_session *session,
session->ust_session->domain_global.channels);
}
DBG3("Number of UST global channels %zd", nb_chan);
session->ust_session->domain_global.channels);
}
DBG3("Number of UST global channels %zd", nb_chan);
- if (nb_chan <
=
0) {
+ if (nb_chan < 0) {
ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
+ goto error;
}
break;
default:
}
break;
default:
- *channels = NULL;
ret = LTTNG_ERR_UND;
goto error;
}
ret = LTTNG_ERR_UND;
goto error;
}
@@
-2465,10
+2469,6
@@
ssize_t cmd_list_channels(int domain, struct ltt_session *session,
}
list_lttng_channels(domain, session, *channels);
}
list_lttng_channels(domain, session, *channels);
- } else {
- *channels = NULL;
- /* Ret value was set in the domain switch case */
- goto error;
}
return nb_chan;
}
return nb_chan;
This page took
0.024245 seconds
and
4
git commands to generate.