Use compiler-agnostic defines to silence warning

[lttng-tools.git] / src / common / userspace-probe.cpp

diff --git a/src/common/userspace-probe.cpp b/src/common/userspace-probe.cpp
index 8be0e07247e4333395e4ca54b78887b9648a5d84..426f12860aec441ce96354b122fd81f2cd1114b4 100644 (file)
--- a/src/common/userspace-probe.cpp
+++ b/src/common/userspace-probe.cpp
@@ -236,13 +236,13 @@ lttng_userspace_probe_location_function_is_equal(const struct lttng_userspace_pr
 
        LTTNG_ASSERT(a->function_name);
        LTTNG_ASSERT(b->function_name);
-       if (strcmp(a->function_name, b->function_name)) {
+       if (strcmp(a->function_name, b->function_name) != 0) {
                goto end;
        }
 
        LTTNG_ASSERT(a->binary_path);
        LTTNG_ASSERT(b->binary_path);
-       if (strcmp(a->binary_path, b->binary_path)) {
+       if (strcmp(a->binary_path, b->binary_path) != 0) {
                goto end;
        }
 
@@ -356,19 +356,19 @@ lttng_userspace_probe_location_tracepoint_is_equal(const struct lttng_userspace_
 
        LTTNG_ASSERT(a->probe_name);
        LTTNG_ASSERT(b->probe_name);
-       if (strcmp(a->probe_name, b->probe_name)) {
+       if (strcmp(a->probe_name, b->probe_name) != 0) {
                goto end;
        }
 
        LTTNG_ASSERT(a->provider_name);
        LTTNG_ASSERT(b->provider_name);
-       if (strcmp(a->provider_name, b->provider_name)) {
+       if (strcmp(a->provider_name, b->provider_name) != 0) {
                goto end;
        }
 
        LTTNG_ASSERT(a->binary_path);
        LTTNG_ASSERT(b->binary_path);
-       if (strcmp(a->binary_path, b->binary_path)) {
+       if (strcmp(a->binary_path, b->binary_path) != 0) {
                goto end;
        }
 
@@ -1436,7 +1436,7 @@ int lttng_userspace_probe_location_create_from_payload(
        int consumed = 0;
        int ret;
        struct lttng_userspace_probe_location_comm *probe_location_comm;
-       struct lttng_payload_view probe_location_comm_view =
+       const lttng_payload_view probe_location_comm_view =
                lttng_payload_view_from_view(view, 0, sizeof(*probe_location_comm));
 
        LTTNG_ASSERT(view);
@@ -1512,7 +1512,7 @@ end:
 static int lttng_userspace_probe_location_function_set_binary_fd_handle(
        struct lttng_userspace_probe_location *location, struct fd_handle *binary_fd)
 {
-       int ret = 0;
+       const int ret = 0;
        struct lttng_userspace_probe_location_function *function_location;
 
        LTTNG_ASSERT(location);
@@ -1529,7 +1529,7 @@ static int lttng_userspace_probe_location_function_set_binary_fd_handle(
 static int lttng_userspace_probe_location_tracepoint_set_binary_fd_handle(
        struct lttng_userspace_probe_location *location, struct fd_handle *binary_fd)
 {
-       int ret = 0;
+       const int ret = 0;
        struct lttng_userspace_probe_location_tracepoint *tracepoint_location;
 
        LTTNG_ASSERT(location);