Build fix: Missing message in LTTNG_DEPRECATED invocation

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

diff --git a/src/common/session-descriptor.c b/src/common/session-descriptor.c
index f111320e44c564b7b202cf39e2bc1260da85ecae..93c7dfa47795f5a5e31fe8d2a8b792c1e9298b52 100644 (file)
--- a/src/common/session-descriptor.c
+++ b/src/common/session-descriptor.c
@@ -10,7 +10,6 @@
 #include <common/defaults.h>
 #include <common/error.h>
 #include <time.h>
-#include <assert.h>
 #include <stdio.h>
 
 struct lttng_session_descriptor_network_location {
@@ -598,7 +597,6 @@ void lttng_session_descriptor_destroy(
        free(descriptor);
 }
 
-LTTNG_HIDDEN
 ssize_t lttng_session_descriptor_create_from_buffer(
                const struct lttng_buffer_view *payload,
                struct lttng_session_descriptor **descriptor)
@@ -616,12 +614,12 @@ ssize_t lttng_session_descriptor_create_from_buffer(
 
        current_view = lttng_buffer_view_from_view(payload, offset,
                        sizeof(*base_header));
-       base_header = (typeof(base_header)) current_view.data;
-       if (!base_header) {
+       if (!lttng_buffer_view_is_valid(&current_view)) {
                ret = -1;
                goto end;
        }
 
+       base_header = (typeof(base_header)) current_view.data;
        switch (base_header->type) {
        case LTTNG_SESSION_DESCRIPTOR_TYPE_REGULAR:
        case LTTNG_SESSION_DESCRIPTOR_TYPE_SNAPSHOT:
@@ -632,12 +630,12 @@ ssize_t lttng_session_descriptor_create_from_buffer(
 
                current_view = lttng_buffer_view_from_view(payload, offset,
                                sizeof(*live_header));
-               live_header = (typeof(live_header)) current_view.data;
-               if (!live_header) {
+               if (!lttng_buffer_view_is_valid(&current_view)) {
                        ret = -1;
                        goto end;
                }
 
+               live_header = (typeof(live_header)) current_view.data;
                live_timer_us = live_header->live_timer_us;
                break;
        }
@@ -674,12 +672,12 @@ ssize_t lttng_session_descriptor_create_from_buffer(
        /* Map the name. */
        current_view = lttng_buffer_view_from_view(payload, offset,
                        base_header->name_len);
-       name = current_view.data;
-       if (!name) {
+       if (!lttng_buffer_view_is_valid(&current_view)) {
                ret = -1;
                goto end;
        }
 
+       name = current_view.data;
        if (base_header->name_len == 1 ||
                        name[base_header->name_len - 1] ||
                        strlen(name) != base_header->name_len - 1) {
@@ -705,11 +703,12 @@ skip_name:
                /* Map a URI. */
                current_view = lttng_buffer_view_from_view(payload,
                                offset, sizeof(*uri));
-               uri = (typeof(uri)) current_view.data;
-               if (!uri) {
+               if (!lttng_buffer_view_is_valid(&current_view)) {
                        ret = -1;
                        goto end;
                }
+
+               uri = (typeof(uri)) current_view.data;
                uris[i] = zmalloc(sizeof(*uri));
                if (!uris[i]) {
                        ret = -1;
@@ -802,7 +801,6 @@ end:
        return ret;
 }
 
-LTTNG_HIDDEN
 int lttng_session_descriptor_serialize(
                const struct lttng_session_descriptor *descriptor,
                struct lttng_dynamic_buffer *buffer)
@@ -875,7 +873,6 @@ end:
        return ret;
 }
 
-LTTNG_HIDDEN
 enum lttng_session_descriptor_type
 lttng_session_descriptor_get_type(
                const struct lttng_session_descriptor *descriptor)
@@ -883,7 +880,6 @@ lttng_session_descriptor_get_type(
        return descriptor->type;
 }
 
-LTTNG_HIDDEN
 enum lttng_session_descriptor_output_type
 lttng_session_descriptor_get_output_type(
                const struct lttng_session_descriptor *descriptor)
@@ -891,7 +887,6 @@ lttng_session_descriptor_get_output_type(
        return descriptor->output_type;
 }
 
-LTTNG_HIDDEN
 void lttng_session_descriptor_get_local_output_uri(
                const struct lttng_session_descriptor *descriptor,
                struct lttng_uri *local_uri)
@@ -899,7 +894,6 @@ void lttng_session_descriptor_get_local_output_uri(
        memcpy(local_uri, descriptor->output.local, sizeof(*local_uri));
 }
 
-LTTNG_HIDDEN
 void lttng_session_descriptor_get_network_output_uris(
                const struct lttng_session_descriptor *descriptor,
                struct lttng_uri *control,
@@ -909,7 +903,6 @@ void lttng_session_descriptor_get_network_output_uris(
        memcpy(data, descriptor->output.network.data, sizeof(*data));
 }
 
-LTTNG_HIDDEN
 unsigned long long
 lttng_session_descriptor_live_get_timer_interval(
                const struct lttng_session_descriptor *descriptor)
@@ -940,7 +933,6 @@ end:
        return status;
 }
 
-LTTNG_HIDDEN
 int lttng_session_descriptor_set_session_name(
                struct lttng_session_descriptor *descriptor,
                const char *name)
@@ -966,7 +958,6 @@ end:
        return ret;
 }
 
-LTTNG_HIDDEN
 bool lttng_session_descriptor_is_output_destination_initialized(
                const struct lttng_session_descriptor *descriptor)
 {
@@ -982,7 +973,6 @@ bool lttng_session_descriptor_is_output_destination_initialized(
        }
 }
 
-LTTNG_HIDDEN
 bool lttng_session_descriptor_has_output_directory(
                const struct lttng_session_descriptor *descriptor)
 {
@@ -1005,7 +995,6 @@ bool lttng_session_descriptor_has_output_directory(
        return false;
 }
 
-LTTNG_HIDDEN
 enum lttng_error_code lttng_session_descriptor_set_default_output(
                struct lttng_session_descriptor *descriptor,
                time_t *session_creation_time,
@@ -1042,7 +1031,7 @@ enum lttng_error_code lttng_session_descriptor_set_default_output(
                                goto end;
                        }
                }
-               assert(descriptor->name);
+               LTTNG_ASSERT(descriptor->name);
                ret = snprintf(local_uri, sizeof(local_uri),
                                "file://%s/%s/%s%s",
                                absolute_home_path,
@@ -1112,7 +1101,6 @@ end:
  * Note that only properties that can be populated by the session daemon
  * (output destination and name) are assigned.
  */
-LTTNG_HIDDEN
 int lttng_session_descriptor_assign(
                struct lttng_session_descriptor *dst,
                const struct lttng_session_descriptor *src)