X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fopt%2Fopt.c;h=d376a598da932445de592c8f12e2466d4bc431bd;hp=d4601dfbb230a3076edfa64d8b5232996f4d59d2;hb=HEAD;hpb=c36444e062622d97e4368670f5c50f0c482a3a95

diff --git a/ccan/opt/opt.c b/ccan/opt/opt.c
index d4601dfb..9149374c 100644
--- a/ccan/opt/opt.c
+++ b/ccan/opt/opt.c
@@ -34,7 +34,7 @@ static const char *next_name(const char *names, unsigned *len)
 static const char *first_opt(unsigned *i, unsigned *len)
 {
 	for (*i = 0; *i < opt_count; (*i)++) {
-		if (opt_table[*i].type == OPT_SUBTABLE)
+		if (opt_table[*i].type & OPT_SUBTABLE)
 			continue;
 		return first_name(opt_table[*i].names, len);
 	}
@@ -44,7 +44,7 @@ static const char *first_opt(unsigned *i, unsigned *len)
 static const char *next_opt(const char *p, unsigned *i, unsigned *len)
 {
 	for (; *i < opt_count; (*i)++) {
-		if (opt_table[*i].type == OPT_SUBTABLE)
+		if (opt_table[*i].type & OPT_SUBTABLE)
 			continue;
 		if (!p)
 			return first_name(opt_table[*i].names, len);
@@ -114,10 +114,11 @@ static void check_opt(const struct opt_table *entry)
 {
 	const char *p;
 	unsigned len;
+	enum opt_type type = entry->type & (OPT_USER_MIN-1);
 
-	if (entry->type != OPT_HASARG && entry->type != OPT_NOARG
-	    && entry->type != (OPT_EARLY|OPT_HASARG)
-	    && entry->type != (OPT_EARLY|OPT_NOARG))
+	if (type != OPT_HASARG && type != OPT_NOARG
+	    && type != (OPT_EARLY|OPT_HASARG)
+	    && type != (OPT_EARLY|OPT_NOARG))
 		failmsg("Option %s: unknown entry type %u",
 			entry->names, entry->type);
 
@@ -161,7 +162,7 @@ static void add_opt(const struct opt_table *entry)
 void _opt_register(const char *names, enum opt_type type,
 		   char *(*cb)(void *arg),
 		   char *(*cb_arg)(const char *optarg, void *arg),
-		   void (*show)(char buf[OPT_SHOW_LEN], const void *arg),
+		   bool (*show)(char *buf, size_t len, const void *arg),
 		   const void *arg, const char *desc)
 {
 	struct opt_table opt;
@@ -181,7 +182,7 @@ bool opt_unregister(const char *names)
 	int found = -1, i;
 
 	for (i = 0; i < opt_count; i++) {
-		if (opt_table[i].type == OPT_SUBTABLE)
+		if (opt_table[i].type & OPT_SUBTABLE)
 			continue;
 		if (strcmp(opt_table[i].names, names) == 0)
 			found = i;
@@ -189,7 +190,8 @@ bool opt_unregister(const char *names)
 	if (found == -1)
 		return false;
 	opt_count--;
-	memmove(&opt_table[found], &opt_table[found+1], opt_count - found);
+	memmove(&opt_table[found], &opt_table[found+1],
+		(opt_count - found) * sizeof(opt_table[found]));
 	return true;
 }
 
@@ -202,7 +204,7 @@ void opt_register_table(const struct opt_table entry[], const char *desc)
 		add_opt(&heading);
 	}
 	for (i = 0; entry[i].type != OPT_END; i++) {
-		if (entry[i].type == OPT_SUBTABLE)
+		if (entry[i].type & OPT_SUBTABLE)
 			opt_register_table(subtable_of(&entry[i]),
 					   entry[i].desc);
 		else {