cast, str, take, tal/grabfile, tal/str, typesafe_cb: use argc

[ccan] / ccan / typesafe_cb / _info

diff --git a/ccan/typesafe_cb/_info b/ccan/typesafe_cb/_info
index 7417febe601e7bc3d1f7b1cb2ddb32ff14625103..b4f379dd48b020c29bf8f27c8da88a37831e619a 100644 (file)
--- a/ccan/typesafe_cb/_info
+++ b/ccan/typesafe_cb/_info
@@ -1,11 +1,11 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * typesafe_cb - macros for safe callbacks.
  *
- * The basis of the typesafe_cb header is cast_if_type(): a
+ * The basis of the typesafe_cb header is typesafe_cb_cast(): a
  * conditional cast macro.   If an expression exactly matches a given
  * type, it is cast to the target type, otherwise it is left alone.
  *
@@ -35,15 +35,16 @@
  * the exactly correct function type to match the argument, or a
  * function which takes a void *.
  *
- * This is where typesafe_cb() comes in: it uses cast_if_type() to
+ * This is where typesafe_cb() comes in: it uses typesafe_cb_cast() to
  * cast the callback function if it matches the argument type:
  *
  *     void _register_callback(void (*cb)(void *arg), void *arg);
  *     #define register_callback(cb, arg)                              \
- *             _register_callback(typesafe_cb(void, (cb), (arg)), (arg))
+ *             _register_callback(typesafe_cb(void, void *, (cb), (arg)), \
+ *                                (arg))
  *
  * On compilers which don't support the extensions required
- * cast_if_type() and friend become an unconditional cast, so your
+ * typesafe_cb_cast() and friend become an unconditional cast, so your
  * code will compile but you won't get type checking.
  *
  * Example:
@@ -72,7 +73,8 @@
  *     }
  *     #define register_callback(value, cb, arg)                       \
  *             _register_callback(value,                               \
- *                                typesafe_cb_preargs(int, (cb), (arg), int),\
+ *                                typesafe_cb_preargs(int, void *,     \
+ *                                                    (cb), (arg), int),\
  *                                (arg))
  *     
  *     static struct callback *find_callback(int value)
@@ -104,7 +106,7 @@
  *     // Silly game to find the longest chain of values.
  *     int main(int argc, char *argv[])
  *     {
- *             int i, run = 1, num = argv[1] ? atoi(argv[1]) : 0;
+ *             int i, run = 1, num = argc > 1 ? atoi(argv[1]) : 0;
  *     
  *             for (i = 1; i < 1024;) {
  *                     // Since run is an int, compiler checks "add" does too.
@@ -133,7 +135,7 @@
  *             return 0;
  *     }
  *
- * License: LGPL (2 or any later version)
+ * License: CC0 (Public domain)
  * Author: Rusty Russell <rusty@rustcorp.com.au>
  */
 int main(int argc, char *argv[])