Use compiler-agnostic defines to silence warning

[lttng-tools.git] / src / common / event.cpp

diff --git a/src/common/event.cpp b/src/common/event.cpp
index b00cda83b7db462793952a323fbfbd277069253a..e4b41b729f73332e84f81ad5eb96d118df92a58f 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -142,7 +142,7 @@ lttng_event_probe_attr_create_from_payload(struct lttng_payload_view *view,
        ssize_t ret, offset = 0;
        const struct lttng_event_probe_attr_comm *comm;
        struct lttng_event_probe_attr *local_attr = nullptr;
        ssize_t ret, offset = 0;
        const struct lttng_event_probe_attr_comm *comm;
        struct lttng_event_probe_attr *local_attr = nullptr;

-       struct lttng_payload_view comm_view =
+       const lttng_payload_view comm_view =

                lttng_payload_view_from_view(view, offset, sizeof(*comm));
 
        if (!lttng_payload_view_is_valid(&comm_view)) {
                lttng_payload_view_from_view(view, offset, sizeof(*comm));
 
        if (!lttng_payload_view_is_valid(&comm_view)) {


@@ -164,7 +164,7 @@ lttng_event_probe_attr_create_from_payload(struct lttng_payload_view *view,
 
        {
                const char *name;
 
        {
                const char *name;

-               struct lttng_payload_view name_view =
+               const lttng_payload_view name_view =

                        lttng_payload_view_from_view(view, offset, comm->symbol_name_len);
 
                if (!lttng_payload_view_is_valid(&name_view)) {
                        lttng_payload_view_from_view(view, offset, comm->symbol_name_len);
 
                if (!lttng_payload_view_is_valid(&name_view)) {


@@ -204,7 +204,7 @@ lttng_event_function_attr_create_from_payload(struct lttng_payload_view *view,
        ssize_t ret, offset = 0;
        const struct lttng_event_function_attr_comm *comm;
        struct lttng_event_function_attr *local_attr = nullptr;
        ssize_t ret, offset = 0;
        const struct lttng_event_function_attr_comm *comm;
        struct lttng_event_function_attr *local_attr = nullptr;

-       struct lttng_payload_view comm_view =
+       const lttng_payload_view comm_view =

                lttng_payload_view_from_view(view, offset, sizeof(*comm));
 
        if (!lttng_payload_view_is_valid(&comm_view)) {
                lttng_payload_view_from_view(view, offset, sizeof(*comm));
 
        if (!lttng_payload_view_is_valid(&comm_view)) {


@@ -223,7 +223,7 @@ lttng_event_function_attr_create_from_payload(struct lttng_payload_view *view,
 
        {
                const char *name;
 
        {
                const char *name;

-               struct lttng_payload_view name_view =
+               const lttng_payload_view name_view =

                        lttng_payload_view_from_view(view, offset, comm->symbol_name_len);
 
                if (!lttng_payload_view_is_valid(&name_view)) {
                        lttng_payload_view_from_view(view, offset, comm->symbol_name_len);
 
                if (!lttng_payload_view_is_valid(&name_view)) {


@@ -346,7 +346,7 @@ ssize_t lttng_event_create_from_payload(struct lttng_payload_view *view,
        assert(view);
 
        {
        assert(view);
 
        {

-               struct lttng_payload_view comm_view =
+               const lttng_payload_view comm_view =

                        lttng_payload_view_from_view(view, offset, sizeof(*event_comm));
 
                if (!lttng_payload_view_is_valid(&comm_view)) {
                        lttng_payload_view_from_view(view, offset, sizeof(*event_comm));
 
                if (!lttng_payload_view_is_valid(&comm_view)) {


@@ -368,7 +368,7 @@ ssize_t lttng_event_create_from_payload(struct lttng_payload_view *view,
        local_event->type = (enum lttng_event_type) event_comm->event_type;
        local_event->loglevel_type = (enum lttng_loglevel_type) event_comm->loglevel_type;
        local_event->loglevel = event_comm->loglevel;
        local_event->type = (enum lttng_event_type) event_comm->event_type;
        local_event->loglevel_type = (enum lttng_loglevel_type) event_comm->loglevel_type;
        local_event->loglevel = event_comm->loglevel;

-       local_event->enabled = event_comm->enabled;
+       local_event->enabled = !!event_comm->enabled;

        local_event->pid = event_comm->pid;
        local_event->flags = (enum lttng_event_flag) event_comm->flags;
 
        local_event->pid = event_comm->pid;
        local_event->flags = (enum lttng_event_flag) event_comm->flags;
 


@@ -441,7 +441,7 @@ deserialize_filter_expression:
 
        {
                const char *filter_expression_buffer;
 
        {
                const char *filter_expression_buffer;

-               struct lttng_buffer_view filter_expression_view = lttng_buffer_view_from_view(
+               const lttng_buffer_view filter_expression_view = lttng_buffer_view_from_view(

                        &view->buffer, offset, event_comm->filter_expression_len);
 
                if (!lttng_buffer_view_is_valid(&filter_expression_view)) {
                        &view->buffer, offset, event_comm->filter_expression_len);
 
                if (!lttng_buffer_view_is_valid(&filter_expression_view)) {


@@ -480,7 +480,7 @@ deserialize_filter_expression:
 
        /* Bytecode */
        {
 
        /* Bytecode */
        {

-               struct lttng_payload_view bytecode_view =
+               const lttng_payload_view bytecode_view =

                        lttng_payload_view_from_view(view, offset, event_comm->bytecode_len);
 
                if (!lttng_payload_view_is_valid(&bytecode_view)) {
                        lttng_payload_view_from_view(view, offset, event_comm->bytecode_len);
 
                if (!lttng_payload_view_is_valid(&bytecode_view)) {


@@ -664,8 +664,8 @@ end:
 
 int lttng_event_serialize(const struct lttng_event *event,
                          unsigned int exclusion_count,
 
 int lttng_event_serialize(const struct lttng_event *event,
                          unsigned int exclusion_count,

-                         char **exclusion_list,
-                         char *filter_expression,
+                         const char *const *exclusion_list,
+                         const char *filter_expression,

                          size_t bytecode_len,
                          struct lttng_bytecode *bytecode,
                          struct lttng_payload *payload)
                          size_t bytecode_len,
                          struct lttng_bytecode *bytecode,
                          struct lttng_payload *payload)


@@ -736,7 +736,7 @@ int lttng_event_serialize(const struct lttng_event *event,
        for (i = 0; i < exclusion_count; i++) {
                const size_t exclusion_len =
                        lttng_strnlen(*(exclusion_list + i), LTTNG_SYMBOL_NAME_LEN);
        for (i = 0; i < exclusion_count; i++) {
                const size_t exclusion_len =
                        lttng_strnlen(*(exclusion_list + i), LTTNG_SYMBOL_NAME_LEN);

-               struct lttng_event_exclusion_comm exclusion_header;
+               struct lttng_event_exclusion_comm exclusion_header = {};

 
                exclusion_header.len = (uint32_t) exclusion_len + 1;
 
 
                exclusion_header.len = (uint32_t) exclusion_len + 1;
 


@@ -1019,7 +1019,7 @@ ssize_t lttng_event_context_create_from_payload(struct lttng_payload_view *view,
        ssize_t ret, offset = 0;
        const struct lttng_event_context_comm *comm;
        struct lttng_event_context *local_context = nullptr;
        ssize_t ret, offset = 0;
        const struct lttng_event_context_comm *comm;
        struct lttng_event_context *local_context = nullptr;

-       struct lttng_buffer_view comm_view =
+       const lttng_buffer_view comm_view =

                lttng_buffer_view_from_view(&view->buffer, offset, sizeof(*comm));
 
        assert(event_ctx);
                lttng_buffer_view_from_view(&view->buffer, offset, sizeof(*comm));
 
        assert(event_ctx);


@@ -1042,7 +1042,7 @@ ssize_t lttng_event_context_create_from_payload(struct lttng_payload_view *view,
        local_context->ctx = (lttng_event_context_type) comm->type;
 
        {
        local_context->ctx = (lttng_event_context_type) comm->type;
 
        {

-               struct lttng_payload_view subtype_view =
+               const lttng_payload_view subtype_view =

                        lttng_payload_view_from_view(view, offset, -1);
 
                switch (local_context->ctx) {
                        lttng_payload_view_from_view(view, offset, -1);
 
                switch (local_context->ctx) {