projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missing error handling: consumerd parse_args should return errors to caller
[lttng-tools.git]
/
src
/
bin
/
lttng-consumerd
/
lttng-consumerd.c
diff --git
a/src/bin/lttng-consumerd/lttng-consumerd.c
b/src/bin/lttng-consumerd/lttng-consumerd.c
index 299776aa00400ea6ab806cb98a49f1a1b0e30f98..ceb1da453a915edcde988f6781aa8c41d3234de8 100644
(file)
--- a/
src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/
src/bin/lttng-consumerd/lttng-consumerd.c
@@
-186,9
+186,9
@@
static void usage(FILE *fp)
/*
* daemon argument parsing
*/
/*
* daemon argument parsing
*/
-static
void
parse_args(int argc, char **argv)
+static
int
parse_args(int argc, char **argv)
{
{
- int c;
+ int c
, ret = 0
;
static struct option long_options[] = {
{ "consumerd-cmd-sock", 1, 0, 'c' },
static struct option long_options[] = {
{ "consumerd-cmd-sock", 1, 0, 'c' },
@@
-218,6
+218,8
@@
static void parse_args(int argc, char **argv)
fprintf(stderr, "option %s", long_options[option_index].name);
if (optarg) {
fprintf(stderr, " with arg %s\n", optarg);
fprintf(stderr, "option %s", long_options[option_index].name);
if (optarg) {
fprintf(stderr, " with arg %s\n", optarg);
+ ret = -1;
+ goto end;
}
break;
case 'c':
}
break;
case 'c':
@@
-260,9
+262,12
@@
static void parse_args(int argc, char **argv)
#endif
default:
usage(stderr);
#endif
default:
usage(stderr);
- exit(EXIT_FAILURE);
+ ret = -1;
+ goto end;
}
}
}
}
+end:
+ return ret;
}
/*
}
/*
This page took
0.023888 seconds
and
4
git commands to generate.