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 5d5703064a110cac4dd8ea389430b878dd8ff302..ceb1da453a915edcde988f6781aa8c41d3234de8 100644 (file)
--- a/src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/src/bin/lttng-consumerd/lttng-consumerd.c
@@ -17,6 +17,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <fcntl.h>
 #include <getopt.h>
 #include <grp.h>
@@ -185,9 +186,9 @@ static void usage(FILE *fp)
 /*
  * 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' },
@@ -217,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);
+                               ret = -1;
+                               goto end;
                        }
                        break;
                case 'c':
@@ -259,9 +262,12 @@ static void parse_args(int argc, char **argv)
 #endif
                default:
                        usage(stderr);
-                       exit(EXIT_FAILURE);
+                       ret = -1;
+                       goto end;
                }
        }
+end:
+       return ret;
 }
 
 /*