projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename override to overwrite for config_load_session
[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 3599503e51ad5b08eba677a01b213a107bad7ad1..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
*/
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <assert.h>
#include <string.h>
#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 <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"
#include "lttng-ctl-helper.h"
@@
-84,7
+83,7
@@
int lttng_load_session_attr_set_session_name(
size_t len;
len = strlen(session_name);
size_t len;
len = strlen(session_name);
- if (len >= NAME_MAX) {
+ if (len >=
LTTNG_
NAME_MAX) {
ret = -LTTNG_ERR_INVALID;
goto error;
}
ret = -LTTNG_ERR_INVALID;
goto error;
}
@@
-101,7
+100,8
@@
int lttng_load_session_attr_set_input_url(
struct lttng_load_session_attr *attr, const char *url)
{
int ret = 0;
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) {
struct lttng_uri *uris = NULL;
if (!attr) {
@@
-160,14
+160,18
@@
end:
int lttng_load_session(struct lttng_load_session_attr *attr)
{
int ret;
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;
}
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;
end:
return ret;
This page took
0.023558 seconds
and
4
git commands to generate.