various: add LICENSE comments.

[ccan] / ccan / opt / opt.h

diff --git a/ccan/opt/opt.h b/ccan/opt/opt.h
index 5757778577e2079b31641f176dd6976fe11c4d3d..643c18de336ba17cdcec3f3f7161dee6b3b513ae 100644 (file)
--- a/ccan/opt/opt.h
+++ b/ccan/opt/opt.h
@@ -1,8 +1,10 @@
+/* Licensed under GPLv3+ - see LICENSE file for details */

 #ifndef CCAN_OPT_H
 #define CCAN_OPT_H
 #include <ccan/compiler/compiler.h>
 #include <ccan/typesafe_cb/typesafe_cb.h>
 #include <stdbool.h>
 #ifndef CCAN_OPT_H
 #define CCAN_OPT_H
 #include <ccan/compiler/compiler.h>
 #include <ccan/typesafe_cb/typesafe_cb.h>
 #include <stdbool.h>

+#include <stdlib.h>

 
 struct opt_table;
 
 
 struct opt_table;
 


@@ -29,7 +31,7 @@ struct opt_table;
  *     OPT_WITH_ARG()
  */
 #define OPT_WITHOUT_ARG(names, cb, arg, desc)  \
  *     OPT_WITH_ARG()
  */
 #define OPT_WITHOUT_ARG(names, cb, arg, desc)  \

-       { (names), OPT_CB_NOARG((cb), (arg)), (desc) }
+       { (names), OPT_CB_NOARG((cb), (arg)), { (arg) }, (desc) }

 
 /**
  * OPT_WITH_ARG() - macro for initializing long and short option (with arg)
 
 /**
  * OPT_WITH_ARG() - macro for initializing long and short option (with arg)


@@ -64,7 +66,7 @@ struct opt_table;
  *     OPT_WITHOUT_ARG()
  */
 #define OPT_WITH_ARG(name, cb, show, arg, desc)        \
  *     OPT_WITHOUT_ARG()
  */
 #define OPT_WITH_ARG(name, cb, show, arg, desc)        \

-       { (name), OPT_CB_ARG((cb), (show), (arg)), (desc) }
+       { (name), OPT_CB_ARG((cb), (show), (arg)), { (arg) }, (desc) }

 
 /**
  * OPT_SUBTABLE() - macro for including another table inside a table.
 
 /**
  * OPT_SUBTABLE() - macro for including another table inside a table.


@@ -73,14 +75,15 @@ struct opt_table;
  */
 #define OPT_SUBTABLE(table, desc)                                      \
        { (const char *)(table), OPT_SUBTABLE,                          \
  */
 #define OPT_SUBTABLE(table, desc)                                      \
        { (const char *)(table), OPT_SUBTABLE,                          \

-       sizeof(_check_is_entry(table)) ? NULL : NULL, NULL, NULL, NULL, (desc) }
+         sizeof(_check_is_entry(table)) ? NULL : NULL, NULL, NULL,     \
+         { NULL }, (desc) }

 
 /**
  * OPT_ENDTABLE - macro to create final entry in table.
  *
  * This must be the final element in the opt_table array.
  */
 
 /**
  * OPT_ENDTABLE - macro to create final entry in table.
  *
  * This must be the final element in the opt_table array.
  */

-#define OPT_ENDTABLE { NULL, OPT_END, NULL, NULL, NULL, NULL, NULL }
+#define OPT_ENDTABLE { NULL, OPT_END, NULL, NULL, NULL, { NULL }, NULL }

 
 /**
  * opt_register_table - register a table of options
 
 /**
  * opt_register_table - register a table of options


@@ -126,7 +129,7 @@ void opt_register_table(const struct opt_table *table, const char *desc);
  * string and return false.
  */
 #define opt_register_noarg(names, cb, arg, desc)                       \
  * string and return false.
  */
 #define opt_register_noarg(names, cb, arg, desc)                       \

-       _opt_register((names), OPT_CB_NOARG((cb), (arg)), (desc))
+       _opt_register((names), OPT_CB_NOARG((cb), (arg)), (arg), (desc))

 
 /**
  * opt_register_arg - register an option with an arguments
 
 /**
  * opt_register_arg - register an option with an arguments


@@ -156,7 +159,7 @@ void opt_register_table(const struct opt_table *table, const char *desc);
  *     opt_register_arg("--explode|--boom", explode, NULL, NULL, opt_hidden);
  */
 #define opt_register_arg(names, cb, show, arg, desc)                   \
  *     opt_register_arg("--explode|--boom", explode, NULL, NULL, opt_hidden);
  */
 #define opt_register_arg(names, cb, show, arg, desc)                   \

-       _opt_register((names), OPT_CB_ARG((cb), (show), (arg)), (desc))
+       _opt_register((names), OPT_CB_ARG((cb), (show), (arg)), (arg), (desc))

 
 /**
  * opt_parse - parse arguments.
 
 /**
  * opt_parse - parse arguments.


@@ -302,36 +305,40 @@ struct opt_table {
        char *(*cb)(void *arg); /* OPT_NOARG */
        char *(*cb_arg)(const char *optarg, void *arg); /* OPT_HASARG */
        void (*show)(char buf[OPT_SHOW_LEN], const void *arg);
        char *(*cb)(void *arg); /* OPT_NOARG */
        char *(*cb_arg)(const char *optarg, void *arg); /* OPT_HASARG */
        void (*show)(char buf[OPT_SHOW_LEN], const void *arg);

-       void *arg;
+       union {
+               const void *carg;
+               void *arg;
+               size_t tlen;
+       } u;

        const char *desc;
 };
 
 /* Resolves to the four parameters for non-arg callbacks. */
 #define OPT_CB_NOARG(cb, arg)                          \
        OPT_NOARG,                                      \
        const char *desc;
 };
 
 /* Resolves to the four parameters for non-arg callbacks. */
 #define OPT_CB_NOARG(cb, arg)                          \
        OPT_NOARG,                                      \

-       cast_if_any(char *(*)(void *), (cb), (cb)+0,    \
-                   char *(*)(typeof(*(arg))*),         \
-                   char *(*)(const typeof(*(arg))*),   \
-                   char *(*)(const void *)),           \
-       NULL, NULL, (arg)
+       typesafe_cb_cast3(char *(*)(void *),    \
+                         char *(*)(typeof(*(arg))*),   \
+                         char *(*)(const typeof(*(arg))*),     \
+                         char *(*)(const void *), (cb)),       \
+       NULL, NULL

 
 /* Resolves to the four parameters for arg callbacks. */
 #define OPT_CB_ARG(cb, show, arg)                                      \
        OPT_HASARG, NULL,                                               \
 
 /* Resolves to the four parameters for arg callbacks. */
 #define OPT_CB_ARG(cb, show, arg)                                      \
        OPT_HASARG, NULL,                                               \

-       cast_if_any(char *(*)(const char *,void *), (cb), (cb)+0,       \
-                   char *(*)(const char *, typeof(*(arg))*),           \
-                   char *(*)(const char *, const typeof(*(arg))*),     \
-                   char *(*)(const char *, const void *)),             \
-       cast_if_type(void (*)(char buf[], const void *), (show), (show)+0, \
-                    void (*)(char buf[], const typeof(*(arg))*)),      \
-       (arg)
+       typesafe_cb_cast3(char *(*)(const char *,void *),       \
+                         char *(*)(const char *, typeof(*(arg))*),     \
+                         char *(*)(const char *, const typeof(*(arg))*), \
+                         char *(*)(const char *, const void *),        \
+                         (cb)),                                        \
+       typesafe_cb_cast(void (*)(char buf[], const void *),            \
+                        void (*)(char buf[], const typeof(*(arg))*), (show))

 
 /* Non-typesafe register function. */
 void _opt_register(const char *names, enum opt_type type,
                   char *(*cb)(void *arg),
                   char *(*cb_arg)(const char *optarg, void *arg),
                   void (*show)(char buf[OPT_SHOW_LEN], const void *arg),
 
 /* Non-typesafe register function. */
 void _opt_register(const char *names, enum opt_type type,
                   char *(*cb)(void *arg),
                   char *(*cb_arg)(const char *optarg, void *arg),
                   void (*show)(char buf[OPT_SHOW_LEN], const void *arg),

-                  void *arg, const char *desc);
+                  const void *arg, const char *desc);

 
 /* We use this to get typechecking for OPT_SUBTABLE */
 static inline int _check_is_entry(struct opt_table *e UNUSED) { return 0; }
 
 /* We use this to get typechecking for OPT_SUBTABLE */
 static inline int _check_is_entry(struct opt_table *e UNUSED) { return 0; }