X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fopt%2Fusage.c;h=f321ed2949a8bfb7cd5cdbce5955780dba1cd233;hp=eedaae7eb821d0dab8114de49222b14496887aa0;hb=af7afcd46e70e87397c33408d88f2bedd2c90bd8;hpb=0191b7a74144ea8193961235f45715e715d4d8eb

diff --git a/ccan/opt/usage.c b/ccan/opt/usage.c
index eedaae7e..f321ed29 100644
--- a/ccan/opt/usage.c
+++ b/ccan/opt/usage.c
@@ -1,3 +1,4 @@
+/* Licensed under GPLv3+ - see LICENSE file for details */
 #include <ccan/opt/opt.h>
 #include <string.h>
 #include <stdlib.h>
@@ -32,8 +33,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 +94,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;