projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: ret is uninitialized on standard path
[lttng-tools.git]
/
src
/
bin
/
lttng
/
lttng.c
diff --git
a/src/bin/lttng/lttng.c
b/src/bin/lttng/lttng.c
index 8cf45410ed28957b0752d8ca05dfde78991114f0..bf2128ca35896dbbc998ecadf125e7eb4774ed6d 100644
(file)
--- a/
src/bin/lttng/lttng.c
+++ b/
src/bin/lttng/lttng.c
@@
-33,6
+33,14
@@
#include "command.h"
#include "command.h"
+static const char *help_msg =
+#ifdef LTTNG_EMBED_HELP
+#include <lttng.1.h>
+#else
+NULL
+#endif
+;
+
/* Variables */
static char *progname;
int opt_no_sessiond;
/* Variables */
static char *progname;
int opt_no_sessiond;
@@
-76,6
+84,7
@@
static struct cmd_struct commands[] = {
{ "list", cmd_list},
{ "load", cmd_load},
{ "metadata", cmd_metadata},
{ "list", cmd_list},
{ "load", cmd_load},
{ "metadata", cmd_metadata},
+ { "regenerate", cmd_regenerate},
{ "save", cmd_save},
{ "set-session", cmd_set_session},
{ "snapshot", cmd_snapshot},
{ "save", cmd_save},
{ "set-session", cmd_set_session},
{ "snapshot", cmd_snapshot},
@@
-84,10
+93,8
@@
static struct cmd_struct commands[] = {
{ "stop", cmd_stop},
{ "track", cmd_track},
{ "untrack", cmd_untrack},
{ "stop", cmd_stop},
{ "track", cmd_track},
{ "untrack", cmd_untrack},
- { "help", NULL},
{ "version", cmd_version},
{ "view", cmd_view},
{ "version", cmd_version},
{ "view", cmd_view},
- { "regenerate", cmd_regenerate},
{ NULL, NULL} /* Array closure */
};
{ NULL, NULL} /* Array closure */
};
@@
-253,7
+260,6
@@
static void show_basic_help(void)
puts(" create " CONFIG_CMD_DESCR_CREATE);
puts(" destroy " CONFIG_CMD_DESCR_DESTROY);
puts(" load " CONFIG_CMD_DESCR_LOAD);
puts(" create " CONFIG_CMD_DESCR_CREATE);
puts(" destroy " CONFIG_CMD_DESCR_DESTROY);
puts(" load " CONFIG_CMD_DESCR_LOAD);
- puts(" metadata " CONFIG_CMD_DESCR_METADATA);
puts(" regenerate " CONFIG_CMD_DESCR_REGENERATE);
puts(" save " CONFIG_CMD_DESCR_SAVE);
puts(" set-session " CONFIG_CMD_DESCR_SET_SESSION);
puts(" regenerate " CONFIG_CMD_DESCR_REGENERATE);
puts(" save " CONFIG_CMD_DESCR_SAVE);
puts(" set-session " CONFIG_CMD_DESCR_SET_SESSION);
@@
-317,10
+323,9
@@
static int parse_args(int argc, char **argv)
ret = 0;
goto end;
case 'h':
ret = 0;
goto end;
case 'h':
- ret = utils_show_man_page(1, "lttng");
-
+ ret = utils_show_help(1, "lttng", help_msg);
if (ret) {
if (ret) {
- ERR("Cannot
view man page lttng(1)
");
+ ERR("Cannot
show --help for `lttng`
");
perror("exec");
}
goto end;
perror("exec");
}
goto end;
This page took
0.0266 seconds
and
4
git commands to generate.