X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Fload.c;h=fb28f4eaeef17a19bae584170c24ceb5563cf3d0;hb=584e475eab79c06cbf71052640c80ebe367a2c47;hp=3811981ef007f6c906ff326fc5b27ddc2d09a093;hpb=9245bd0e72bbb5cea41f8f6483e7ef3e088a2403;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/load.c b/src/lib/lttng-ctl/load.c
index 3811981ef..fb28f4eae 100644
--- a/src/lib/lttng-ctl/load.c
+++ b/src/lib/lttng-ctl/load.c
@@ -15,7 +15,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <string.h>
 
@@ -23,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"
 
@@ -83,7 +83,7 @@ int lttng_load_session_attr_set_session_name(
 		size_t len;
 
 		len = strlen(session_name);
-		if (len >= NAME_MAX) {
+		if (len >= LTTNG_NAME_MAX) {
 			ret = -LTTNG_ERR_INVALID;
 			goto error;
 		}
@@ -100,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) {
@@ -159,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);
+	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;