Cleanup: remove unused internal lttng_session_descriptor_get_base_path

[lttng-tools.git] / src / common / session-descriptor.c

diff --git a/src/common/session-descriptor.c b/src/common/session-descriptor.c
index b5fdb0677f8153d00e1c8517f16816e9e02dbb69..224138dd22a2462d3b2c1a89d9839abe84f786d7 100644 (file)
--- 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);
 
        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;
 
        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);
        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;
 
        return descriptor ? &descriptor->base : NULL;

-error:
-       lttng_session_descriptor_destroy(descriptor ? &descriptor->base : NULL);
-       return NULL;

 }
 
 struct lttng_session_descriptor *
 }
 
 struct lttng_session_descriptor *


@@ -1178,22 +1176,3 @@ int lttng_session_descriptor_assign(
 end:
        return ret;
 }
 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:
-       {
-               *_base_path = dst->output.network.control->subdir[0] ?
-                               dst->output.network.control->subdir : NULL;
-               break;
-       }
-       case LTTNG_SESSION_DESCRIPTOR_OUTPUT_TYPE_LOCAL:
-       case LTTNG_SESSION_DESCRIPTOR_OUTPUT_TYPE_NONE:
-               *_base_path = NULL;
-               break;
-       }
-       return 0;
-}