X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Futils.c;h=f84859fc621645aea1939d7c04648c7ac729682a;hp=51fdc99335054362e7a08011ba467cfe26bab1b6;hb=505b2d90aa87592186ecc2a119cf67fb3f90d168;hpb=d295668767ac8234e83984e1812d342d03293d88

diff --git a/src/bin/lttng-sessiond/utils.c b/src/bin/lttng-sessiond/utils.c
index 51fdc9933..f84859fc6 100644
--- a/src/bin/lttng-sessiond/utils.c
+++ b/src/bin/lttng-sessiond/utils.c
@@ -1,19 +1,9 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -99,15 +89,12 @@ int loglevels_match(int a_loglevel_type, int a_loglevel_value,
 
 const char *session_get_base_path(const struct ltt_session *session)
 {
-	return session->net_handle > 0 ?
-			session->consumer->dst.net.base_dir :
-			session->consumer->dst.session_root_path;
+	return consumer_output_get_base_path(session->consumer);
 }
 
-const char *snapshot_output_get_base_path(
-		const struct snapshot_output *snapshot_output)
+const char *consumer_output_get_base_path(const struct consumer_output *output)
 {
-	return snapshot_output->consumer->type == CONSUMER_DST_LOCAL ?
-			snapshot_output->consumer->dst.session_root_path :
-			snapshot_output->consumer->dst.net.base_dir;
+	return output->type == CONSUMER_DST_LOCAL ?
+			output->dst.session_root_path :
+			output->dst.net.base_dir;
 }