Revert "lttng-ctl: Hide symbol introduced by fix"

[lttng-tools.git] / src / common / sessiond-comm / inet6.cpp

diff --git a/src/common/sessiond-comm/inet6.cpp b/src/common/sessiond-comm/inet6.cpp
index 21b8378e12e30b34f4c897d8ca2ad3df637b11c1..0d1b6f15ba02611024e61340f76f3027ae1d1011 100644 (file)
--- a/src/common/sessiond-comm/inet6.cpp
+++ b/src/common/sessiond-comm/inet6.cpp
@@ -97,7 +97,7 @@ static int connect_no_timeout(struct lttcomm_sock *sock)
 
 static int connect_with_timeout(struct lttcomm_sock *sock)
 {
-       unsigned long timeout = lttcomm_get_network_timeout();
+       const unsigned long timeout = lttcomm_get_network_timeout();
        int ret, flags, connect_ret;
        struct timespec orig_time, cur_time;
        unsigned long diff_ms;
@@ -251,7 +251,7 @@ struct lttcomm_sock *lttcomm_accept_inet6_sock(struct lttcomm_sock *sock)
        }
 
        new_sock = lttcomm_alloc_sock(sock->proto);
-       if (new_sock == NULL) {
+       if (new_sock == nullptr) {
                goto error;
        }
 
@@ -272,7 +272,7 @@ end:
 
 error:
        free(new_sock);
-       return NULL;
+       return nullptr;
 }
 
 /*