tdb2: rework lock.c functions to return enum TDB_ERROR.

[ccan] / ccan / opt / test / utils.c

diff --git a/ccan/opt/test/utils.c b/ccan/opt/test/utils.c
index 2a310495fba5cd96eff4d45c8a96446430a0e7c6..802b15381042b0dc63a26f440e54bb8c0f2b7f0c 100644 (file)
--- a/ccan/opt/test/utils.c
+++ b/ccan/opt/test/utils.c
@@ -35,7 +35,9 @@ static void save_err_output(const char *fmt, ...)
        char *p;
 
        va_start(ap, fmt);
-       vasprintf(&p, fmt, ap);
+       /* Check return, for fascist gcc */
+       if (vasprintf(&p, fmt, ap) == -1)
+               p = NULL;
        va_end(ap);
 
        if (err_output) {
@@ -84,17 +86,17 @@ struct opt_table long_table[] = {
 
 struct opt_table long_and_short_table[] = {
        /* Short and long, different args. */
-       OPT_WITHOUT_ARG("--ggg/-g", test_noarg, "ggg", "Description of ggg"),
-       OPT_WITH_ARG("-h/--hhh", test_arg, NULL, "hhh", "Description of hhh"),
+       OPT_WITHOUT_ARG("--ggg|-g", test_noarg, "ggg", "Description of ggg"),
+       OPT_WITH_ARG("-h|--hhh", test_arg, NULL, "hhh", "Description of hhh"),
        OPT_ENDTABLE
 };
 
 /* Sub-table test. */
 struct opt_table subtables[] = {
        /* Two short, and two long long, no description */
-       OPT_WITH_ARG("--jjj/-j/--lll/-l", test_arg, show_arg, "jjj", ""),
+       OPT_WITH_ARG("--jjj|-j|--lll|-l", test_arg, show_arg, "jjj", ""),
        /* Hidden option */
-       OPT_WITH_ARG("--mmm/-m", test_arg, show_arg, "mmm", opt_hidden),
+       OPT_WITH_ARG("--mmm|-m", test_arg, show_arg, "mmm", opt_hidden),
        OPT_SUBTABLE(short_table, NULL),
        OPT_SUBTABLE(long_table, "long table options"),
        OPT_SUBTABLE(long_and_short_table, NULL),