#define vfprintf(f, fmt, ap) saved_vprintf(fmt, ap)
static int saved_vprintf(const char *fmt, va_list ap);
-#define malloc(size) saved_malloc(size)
-static void *saved_malloc(size_t size);
-
#include <ccan/opt/helpers.c>
#include <ccan/opt/opt.c>
#include <ccan/opt/usage.c>
return ret;
}
-#undef malloc
-static void *last_allocation;
-static void *saved_malloc(size_t size)
-{
- return last_allocation = malloc(size);
-}
-
static void set_args(int *argc, char ***argv, ...)
{
va_list ap;
/* Test helpers. */
int main(int argc, char *argv[])
{
- plan_tests(452);
+ plan_tests(454);
/* opt_set_bool */
{
}
/* opt_set_charp */
{
- char *arg = (char *)"wrong";
+ char *arg = cast_const(char *, "wrong");
reset_options();
opt_register_arg("-a", opt_set_charp, NULL, &arg, "All");
ok1(parse_args(&argc, &argv, "-a", "string", NULL));
fail("opt_show_version_and_exit returned?");
} else {
ok1(exitval - 1 == 0);
+ /* We should have freed table!. */
+ ok1(opt_table == NULL);
}
ok1(strcmp(output, "1.2.3\n") == 0);
free(output);
fail("opt_usage_and_exit returned?");
} else {
ok1(exitval - 1 == 0);
+ /* We should have freed table!. */
+ ok1(opt_table == NULL);
}
ok1(strstr(output, "[args]"));
ok1(strstr(output, argv[0]));
- ok1(strstr(output, "[-a]"));
+ ok1(strstr(output, "\n-a"));
free(output);
free(argv);
- /* It exits without freeing usage string. */
- free(last_allocation);
output = NULL;
}