X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fopt%2Ftest%2Frun-usage.c;h=7d94ced219b59868883801cb26bd7f362019e4f7;hp=73e6a949e912a161ea916adfcb46b73c500e304c;hb=42cdf910d2ab677e8cdafe17085efdf68c12b3da;hpb=39dc9e4612339af669e934c47500605f826a2bb4

diff --git a/ccan/opt/test/run-usage.c b/ccan/opt/test/run-usage.c
index 73e6a949..7d94ced2 100644
--- a/ccan/opt/test/run-usage.c
+++ b/ccan/opt/test/run-usage.c
@@ -4,6 +4,15 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include "utils.h"
+
+/* Ensure width is sane. */
+static const char *getenv_override(const char *name)
+{
+	return "100";
+}
+
+#define getenv getenv_override
+
 #include <ccan/opt/opt.c>
 #include <ccan/opt/usage.c>
 #include <ccan/opt/helpers.c>
@@ -14,13 +23,6 @@ static char *my_cb(void *p)
 	return NULL;
 }
 
-static void reset_options(void)
-{
-	free(opt_table);
-	opt_table = NULL;
-	opt_count = opt_num_short = opt_num_short_arg = opt_num_long = 0;
-}
-
 /* Test helpers. */
 int main(int argc, char *argv[])
 {
@@ -106,5 +108,7 @@ int main(int argc, char *argv[])
 	ok1(strstr(output, "AAAAll"));
 	free(output);
 
+	free(shortname);
+	free(longname);
 	return exit_status();
 }