/* We don't actually want it to exit... */
static jmp_buf exited;
-#define errx save_and_jump
+#define failmsg save_and_jump
-static void save_and_jump(int ecode, const char *fmt, ...);
+static void save_and_jump(const char *fmt, ...);
#include <ccan/opt/helpers.c>
#include <ccan/opt/opt.c>
return ret;
}
-static void save_and_jump(int ecode, const char *fmt, ...)
+static void save_and_jump(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
saved_vprintf(fmt, ap);
va_end(ap);
- longjmp(exited, ecode + 1);
+ longjmp(exited, 1);
}
static void reset(void)
NULL, NULL, "1.2.3", "");
fail("_opt_register returned?");
} else {
- ok1(exitval - 1 == 1);
+ ok1(exitval == 1);
ok1(strstr(output, "Option -a: unknown entry type"));
}
reset();
opt_register_noarg("-a", test_noarg, "", NULL);
fail("_opt_register returned?");
} else {
- ok1(exitval - 1 == 1);
+ ok1(exitval == 1);
ok1(strstr(output, "Option -a: description cannot be NULL"));
}
reset();
opt_register_noarg("a", test_noarg, "", "");
fail("_opt_register returned?");
} else {
- ok1(exitval - 1 == 1);
+ ok1(exitval == 1);
ok1(strstr(output, "Option a: does not begin with '-'"));
}
opt_register_noarg("--", test_noarg, "", "");
fail("_opt_register returned?");
} else {
- ok1(exitval - 1 == 1);
+ ok1(exitval == 1);
ok1(strstr(output, "Option --: invalid long option '--'"));
}
opt_register_noarg("--a|-aaa", test_noarg, "", "");
fail("_opt_register returned?");
} else {
- ok1(exitval - 1 == 1);
+ ok1(exitval == 1);
ok1(strstr(output,
"Option --a|-aaa: invalid short option '-aaa'"));
}
opt_register_noarg("--a foo", test_noarg, "", "");
fail("_opt_register returned?");
} else {
- ok1(exitval - 1 == 1);
+ ok1(exitval == 1);
ok1(strstr(output,
"Option --a foo: does not take arguments 'foo'"));
}
opt_register_noarg("--a=foo", test_noarg, "", "");
fail("_opt_register returned?");
} else {
- ok1(exitval - 1 == 1);
+ ok1(exitval == 1);
ok1(strstr(output,
"Option --a=foo: does not take arguments 'foo'"));
}