Fix: use ssize_type for the return value of uri_parse_str_urls

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

diff --git a/src/lib/lttng-ctl/load.c b/src/lib/lttng-ctl/load.c
index 29998cda303e5c1894cff26ca4b90c26aa244cc8..fb28f4eaeef17a19bae584170c24ceb5563cf3d0 100644 (file)
--- a/src/lib/lttng-ctl/load.c
+++ b/src/lib/lttng-ctl/load.c
@@ -15,7 +15,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <assert.h>
 #include <string.h>
@@ -24,7 +23,7 @@
 #include <lttng/load.h>
 #include <lttng/load-internal.h>
 #include <common/sessiond-comm/sessiond-comm.h>
-#include <common/config/config.h>
+#include <common/config/session-config.h>
 
 #include "lttng-ctl-helper.h"
 
@@ -101,7 +100,8 @@ int lttng_load_session_attr_set_input_url(
        struct lttng_load_session_attr *attr, const char *url)
 {
        int ret = 0;
-       size_t len, size;
+       size_t len;
+       ssize_t size;
        struct lttng_uri *uris = NULL;
 
        if (!attr) {
@@ -160,14 +160,18 @@ end:
 int lttng_load_session(struct lttng_load_session_attr *attr)
 {
        int ret;
+       const char *url, *session_name;
 
        if (!attr) {
                ret = -LTTNG_ERR_INVALID;
                goto end;
        }
 
-       ret = config_load_session(attr->input_url, attr->session_name,
-                       attr->overwrite, 0);
+       url = attr->input_url[0] != '\0' ? attr->input_url : NULL;
+       session_name = attr->session_name[0] != '\0' ?
+                       attr->session_name : NULL;
+
+       ret = config_load_session(url, session_name, attr->overwrite, 0);
 
 end:
        return ret;