tdb2: check pid before unlock.

[ccan] / ccan / opt / usage.c

diff --git a/ccan/opt/usage.c b/ccan/opt/usage.c
index eedaae7eb821d0dab8114de49222b14496887aa0..4d784bc2be73550a5b9818a31a245eafbc56adf7 100644 (file)
--- a/ccan/opt/usage.c
+++ b/ccan/opt/usage.c
@@ -32,8 +32,8 @@ char *opt_usage(const char *argv0, const char *extra)
                extra = "";
                for (i = 0; i < opt_count; i++) {
                        if (opt_table[i].cb == (void *)opt_usage_and_exit
-                           && opt_table[i].arg) {
-                               extra = opt_table[i].arg;
+                           && opt_table[i].u.carg) {
+                               extra = opt_table[i].u.carg;
                                break;
                        }
                }
@@ -93,14 +93,14 @@ char *opt_usage(const char *argv0, const char *extra)
                        len += sprintf(p + len, " <arg>");
                len += sprintf(p + len, "%.*s",
                               len < strlen(OPT_SPACE_PAD)
-                              ? strlen(OPT_SPACE_PAD) - len : 1,
+                              ? (unsigned)strlen(OPT_SPACE_PAD) - len : 1,
                               OPT_SPACE_PAD);
 
                len += sprintf(p + len, "%s", opt_table[i].desc);
                if (opt_table[i].show) {
                        char buf[OPT_SHOW_LEN + sizeof("...")];
                        strcpy(buf + OPT_SHOW_LEN, "...");
-                       opt_table[i].show(buf, opt_table[i].arg);
+                       opt_table[i].show(buf, opt_table[i].u.arg);
                        len += sprintf(p + len, " (default: %s)", buf);
                }
                p += len;