projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Harmonise lttng.h and lttng-ctl.c documentation
[lttng-tools.git]
/
src
/
bin
/
lttng
/
commands
/
create.c
diff --git
a/src/bin/lttng/commands/create.c
b/src/bin/lttng/commands/create.c
index 9dc3752244616c122683416f4d9ee7af5945d33b..99e5daa932511bd0b891a773df2be7dc5399a55d 100644
(file)
--- a/
src/bin/lttng/commands/create.c
+++ b/
src/bin/lttng/commands/create.c
@@
-67,7
+67,7
@@
static void usage(FILE *ofp)
*/
static int create_session()
{
*/
static int create_session()
{
- int ret
, have_name = 0
;
+ int ret;
char datetime[16];
char *session_name, *traces_path = NULL, *alloc_path = NULL;
time_t rawtime;
char datetime[16];
char *session_name, *traces_path = NULL, *alloc_path = NULL;
time_t rawtime;
@@
-80,37
+80,33
@@
static int create_session()
/* Auto session name creation */
if (opt_session_name == NULL) {
/* Auto session name creation */
if (opt_session_name == NULL) {
- ret = asprintf(&session_name, "auto
-%s", datetime
);
+ ret = asprintf(&session_name, "auto
"
);
if (ret < 0) {
perror("asprintf session name");
if (ret < 0) {
perror("asprintf session name");
+ ret = CMD_ERROR;
goto error;
}
DBG("Auto session name set to %s", session_name);
} else {
session_name = opt_session_name;
goto error;
}
DBG("Auto session name set to %s", session_name);
} else {
session_name = opt_session_name;
- have_name = 1;
}
/* Auto output path */
if (opt_output_path == NULL) {
alloc_path = strdup(config_get_default_path());
if (alloc_path == NULL) {
}
/* Auto output path */
if (opt_output_path == NULL) {
alloc_path = strdup(config_get_default_path());
if (alloc_path == NULL) {
- ERR("Home path not found.\n
\
-
Please specify an output path using -o, --output PATH
");
+ ERR("Home path not found.\n
"
+
"Please specify an output path using -o, --output PATH\n
");
ret = CMD_FATAL;
goto error;
}
ret = CMD_FATAL;
goto error;
}
- if (have_name) {
- ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME
+ ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME
"/%s-%s", alloc_path, session_name, datetime);
"/%s-%s", alloc_path, session_name, datetime);
- } else {
- ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME
- "/%s", alloc_path, session_name);
- }
if (ret < 0) {
perror("asprintf trace dir name");
if (ret < 0) {
perror("asprintf trace dir name");
+ ret = CMD_ERROR;
goto error;
}
} else {
goto error;
}
} else {
@@
-119,15
+115,14
@@
static int create_session()
ret = lttng_create_session(session_name, traces_path);
if (ret < 0) {
ret = lttng_create_session(session_name, traces_path);
if (ret < 0) {
+ ret = CMD_ERROR;
goto error;
}
/* Init lttng session config */
ret = config_init(session_name);
if (ret < 0) {
goto error;
}
/* Init lttng session config */
ret = config_init(session_name);
if (ret < 0) {
- if (ret == -1) {
- ret = CMD_ERROR;
- }
+ ret = CMD_ERROR;
goto error;
}
goto error;
}
@@
-163,11
+158,10
@@
int cmd_create(int argc, const char **argv)
while ((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
case OPT_HELP:
while ((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
case OPT_HELP:
- usage(std
err
);
+ usage(std
out
);
goto end;
case OPT_LIST_OPTIONS:
list_cmd_options(stdout, long_options);
goto end;
case OPT_LIST_OPTIONS:
list_cmd_options(stdout, long_options);
- ret = CMD_SUCCESS;
goto end;
default:
usage(stderr);
goto end;
default:
usage(stderr);
This page took
0.024477 seconds
and
4
git commands to generate.