X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsession-descriptor.c;h=224138dd22a2462d3b2c1a89d9839abe84f786d7;hp=208eb46ffa8593bb978a6f7c87a7c83b37661c3b;hb=f7c3ffd79ddcece895eb0de616001d549aced5fc;hpb=97e14d51a63e9abd40d9bce02fe66ee70100e252

diff --git a/src/common/session-descriptor.c b/src/common/session-descriptor.c
index 208eb46ff..224138dd2 100644
--- a/src/common/session-descriptor.c
+++ b/src/common/session-descriptor.c
@@ -522,6 +522,10 @@ _lttng_session_descriptor_live_network_create(
 
 	descriptor = _lttng_session_descriptor_live_create(name,
 			live_timer_interval_us);
+	if (!descriptor) {
+		goto error;
+	}
+
 	descriptor->base.output_type =
 			LTTNG_SESSION_DESCRIPTOR_OUTPUT_TYPE_NETWORK;
 
@@ -550,14 +554,8 @@ lttng_session_descriptor_live_create(
 	struct lttng_session_descriptor_live *descriptor;
 
 	descriptor = _lttng_session_descriptor_live_create(name, live_timer_us);
-	if (!descriptor) {
-		goto error;
-	}
 
 	return descriptor ? &descriptor->base : NULL;
-error:
-	lttng_session_descriptor_destroy(descriptor ? &descriptor->base : NULL);
-	return NULL;
 }
 
 struct lttng_session_descriptor *
@@ -1178,26 +1176,3 @@ int lttng_session_descriptor_assign(
 end:
 	return ret;
 }
-
-LTTNG_HIDDEN
-int lttng_session_descriptor_get_base_path(struct lttng_session_descriptor *dst,
-		const char **_base_path)
-{
-	switch (dst->output_type) {
-	case LTTNG_SESSION_DESCRIPTOR_OUTPUT_TYPE_NETWORK:
-	{
-		if (dst->output.network.control &&
-				dst->output.network.control->subdir[0]) {
-			*_base_path = dst->output.network.control->subdir;
-		} else {
-			*_base_path = NULL;
-		}
-		break;
-	}
-	case LTTNG_SESSION_DESCRIPTOR_OUTPUT_TYPE_LOCAL:
-	case LTTNG_SESSION_DESCRIPTOR_OUTPUT_TYPE_NONE:
-		*_base_path = NULL;
-		break;
-	}
-	return 0;
-}