bin: compile lttng-consumerd as a C++

[lttng-tools.git] / src / lib / lttng-ctl / lttng-ctl-health.c

diff --git a/src/lib/lttng-ctl/lttng-ctl-health.c b/src/lib/lttng-ctl/lttng-ctl-health.c
index dc1516db5d0c7336371e10f0408927eef34a949e..955b1fcd00cb5e617d0756c95db8267032b83897 100644 (file)
--- a/src/lib/lttng-ctl/lttng-ctl-health.c
+++ b/src/lib/lttng-ctl/lttng-ctl-health.c
@@ -231,8 +231,8 @@ struct lttng_health *lttng_health_create_relayd(const char *path)
                goto error;
        }
 
-       ret = lttng_strncpy(lh->health_sock_path, path ?: "",
-                           sizeof(lh->health_sock_path));
+       ret = lttng_strncpy(lh->health_sock_path, path,
+                       sizeof(lh->health_sock_path));
        if (ret) {
                goto error;
        }
@@ -306,7 +306,7 @@ close_error:
                int closeret;
 
                closeret = close(sock);
-               assert(!closeret);
+               LTTNG_ASSERT(!closeret);
        }
 
 error: