Standardize `!ptr` i/o `ptr == NULL`, `ptr` i/o `ptr != NULL`

[babeltrace.git] / src / plugins / ctf / lttng-live / viewer-connection.c

diff --git a/src/plugins/ctf/lttng-live/viewer-connection.c b/src/plugins/ctf/lttng-live/viewer-connection.c
index 0badf75b9565d4456b975e62eb2b946818ba998e..ac3354274f79179a7317bf22cb6b0ff663ff6bb5 100644 (file)
--- a/src/plugins/ctf/lttng-live/viewer-connection.c
+++ b/src/plugins/ctf/lttng-live/viewer-connection.c
@@ -149,10 +149,10 @@ int parse_url(struct live_viewer_connection *viewer_connection)
                        "proto : %s",
                        viewer_connection->relay_hostname->str,
                        viewer_connection->port,
-                       viewer_connection->target_hostname == NULL ?
-                               "<none>" : viewer_connection->target_hostname->str,
-                       viewer_connection->session_name == NULL ?
-                               "<none>" : viewer_connection->session_name->str,
+                       !viewer_connection->target_hostname ?
+                       "<none>" : viewer_connection->target_hostname->str,
+                       !viewer_connection->session_name ?
+                       "<none>" : viewer_connection->session_name->str,
                        lttng_live_url_parts.proto->str);
        ret = 0;
 
@@ -347,9 +347,8 @@ int list_update_session(bt_value *results,
                hostname_str = bt_value_string_get(hostname);
                session_name_str = bt_value_string_get(session_name);
 
-               if (!strcmp(session->hostname, hostname_str)
-                               && !strcmp(session->session_name,
-                                       session_name_str)) {
+               if (strcmp(session->hostname, hostname_str) == 0
+                               && strcmp(session->session_name, session_name_str) == 0) {
                        int64_t val;
                        uint32_t streams = be32toh(session->streams);
                        uint32_t clients = be32toh(session->clients);
@@ -362,10 +361,10 @@ int list_update_session(bt_value *results,
                                ret = -1;
                                goto end;
                        }
-                       val = bt_value_signed_integer_get(btval);
+                       val = bt_value_integer_signed_get(btval);
                        /* sum */
                        val += streams;
-                       bt_value_signed_integer_set(btval, val);
+                       bt_value_integer_signed_set(btval, val);
 
                        btval = bt_value_map_borrow_entry_value(map, "client-count");
                        if (!btval) {
@@ -373,10 +372,10 @@ int list_update_session(bt_value *results,
                                ret = -1;
                                goto end;
                        }
-                       val = bt_value_signed_integer_get(btval);
+                       val = bt_value_integer_signed_get(btval);
                        /* max */
                        val = bt_max_t(int64_t, clients, val);
-                       bt_value_signed_integer_set(btval, val);
+                       bt_value_integer_signed_set(btval, val);
                }
 
                if (found) {
@@ -1479,7 +1478,7 @@ struct live_viewer_connection *live_viewer_connection_create(
 
        viewer_connection = g_new0(struct live_viewer_connection, 1);
 
-       if (bt_socket_init() != 0) {
+       if (bt_socket_init(lttng_live_msg_iter->log_level) != 0) {
                goto error;
        }