X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Futils.c;h=38082f639dba92024467f7c22e1252569cfb8350;hp=99ec7772bfcf849da5730c5aeca3e7924e870261;hb=b178f53e90c376dd44b020535c32649edef8f80e;hpb=3b33e9e731f2091e8aa13ea035c295ed6f101eac diff --git a/src/bin/lttng-sessiond/utils.c b/src/bin/lttng-sessiond/utils.c index 99ec7772b..38082f639 100644 --- a/src/bin/lttng-sessiond/utils.c +++ b/src/bin/lttng-sessiond/utils.c @@ -98,19 +98,7 @@ int loglevels_match(int a_loglevel_type, int a_loglevel_value, const char *session_get_base_path(const struct ltt_session *session) { - struct consumer_output *consumer; - - if (session->kernel_session) { - consumer = session->kernel_session->consumer; - } else if (session->ust_session) { - consumer = session->ust_session->consumer; - } else { - abort(); - } - - if (session->net_handle > 0) { - return consumer->dst.net.base_dir; - } else { - return consumer->dst.session_root_path; - } + return session->net_handle > 0 ? + session->consumer->dst.net.base_dir : + session->consumer->dst.session_root_path; }