opt: add opt_log_stderr_exit helper, and opt_usage NULL option.

[ccan] / ccan / opt / opt.c

diff --git a/ccan/opt/opt.c b/ccan/opt/opt.c
index 841e9b4eb2d4021c6b97432e2c65edb8e8754d90..de56299cc34a6259bd45650867e5b856d11116fc 100644 (file)
--- a/ccan/opt/opt.c
+++ b/ccan/opt/opt.c
@@ -83,7 +83,7 @@ static const char *next_lopt(const char *p, unsigned *i, unsigned *len)
 const char *first_sopt(unsigned *i)
 {
        const char *p;
-       unsigned int len;
+       unsigned int len = 0 /* GCC bogus warning */;
 
        for (p = first_opt(i, &len); p; p = next_opt(p, i, &len)) {
                if (p[0] != '-')
@@ -215,7 +215,7 @@ static char *make_optstring(void)
 static struct option *make_options(void)
 {
        struct option *options = malloc(sizeof(*options) * (opt_num_long + 1));
-       unsigned int i, num = 0, len;
+       unsigned int i, num = 0, len = 0 /* GCC bogus warning */;
        const char *p;
 
        for (p = first_lopt(&i, &len); p; p = next_lopt(p, &i, &len)) {
@@ -296,7 +296,7 @@ bool opt_parse(int *argc, char *argv[], void (*errlog)(const char *fmt, ...))
        while ((ret = getopt_long(*argc, argv, optstring, options, &longidx))
               != -1) {
                char *problem;
-               const char *name;
+               const char *name = NULL; /* GCC bogus warning */
 
                /* optopt is 0 if it's an unknown long option, *or* if
                 * -? is a valid short option. */
@@ -347,9 +347,21 @@ void opt_log_stderr(const char *fmt, ...)
 
        va_start(ap, fmt);
        vfprintf(stderr, fmt, ap);
+       fprintf(stderr, "\n");
        va_end(ap);
 }
 
+void opt_log_stderr_exit(const char *fmt, ...)
+{
+       va_list ap;
+
+       va_start(ap, fmt);
+       vfprintf(stderr, fmt, ap);
+       fprintf(stderr, "\n");
+       va_end(ap);
+       exit(1);
+}
+
 char *opt_invalid_argument(const char *arg)
 {
        char *str = malloc(sizeof("Invalid argument '%s'") + strlen(arg));