X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fopt%2Ftest%2Frun-add_desc.c;h=b559c7f747689bae70d34589ee9794f4cf710ac0;hp=ded3f88061deddcaa5d1a8378a659631f9af614f;hb=HEAD;hpb=3d45cf27cf586c9afe078ceb06fee115ea246a92

diff --git a/ccan/opt/test/run-add_desc.c b/ccan/opt/test/run-add_desc.c
index ded3f880..03e6986d 100644
--- a/ccan/opt/test/run-add_desc.c
+++ b/ccan/opt/test/run-add_desc.c
@@ -4,25 +4,34 @@
 #include <ccan/opt/helpers.c>
 #include <ccan/opt/parse.c>
 
-static void show_10(char buf[OPT_SHOW_LEN], const void *arg)
+static bool show_10(char *buf, size_t len, const void *arg UNNEEDED)
 {
 	memset(buf, 'X', 10);
 	buf[10] = '\0';
+	return true;
 }
 
-static void show_max(char buf[OPT_SHOW_LEN], const void *arg)
+static bool show_10_false(char *buf, size_t len, const void *arg UNNEEDED)
+{
+	memset(buf, 'X', 10);
+	buf[10] = '\0';
+	return false;
+}
+
+static bool show_max(char *buf, size_t len, const void *arg UNNEEDED)
 {
 	memset(buf, 'X', OPT_SHOW_LEN);
+	return true;
 }
 
 /* Test add_desc helper. */
-int main(int argc, char *argv[])
+int main(void)
 {
 	struct opt_table opt;
 	char *ret;
 	size_t len, max;
 
-	plan_tests(30);
+	plan_tests(32);
 
 	opt.show = NULL;
 	opt.names = "01234";
@@ -113,6 +122,14 @@ int main(int argc, char *argv[])
 		   "        (default: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX...)\n") == 0);
 	free(ret); len = max = 0;
 
+	/* With show function which fails doesn't print. */
+	opt.show = show_10_false;
+	ret = add_desc(NULL, &len, &max, 7, 41, &opt);
+	ok1(len < max);
+	ret[len] = '\0';
+	ok1(strcmp(ret, "01234  0123456789 0\n") == 0);
+	free(ret); len = max = 0;
+
 	/* With added " <arg>".  Fits, just. */
 	opt.show = NULL;
 	opt.type = OPT_HASARG;