CL_GET_STR_ARG: Move into util.h

Move this handy macro from pubkeys.c so that we can reuse it.
(And rename it appropriately.)

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/pubkeys.c b/pubkeys.c
index 62f55259ef3efebd7ab9e1793155a72334582135..efcfa77fc31d717ab9a93d79edc312e1d16be121 100644 (file)
--- a/pubkeys.c
+++ b/pubkeys.c
@@ -49,15 +49,8 @@ const struct sigscheme_info *sigscheme_lookup(const char *name)
 static list_t *makepublic_apply(closure_t *self, struct cloc loc,
                                dict_t *context, list_t *args)
 {
-#define ARG(ix,vn,what)                                                        \
-    item_t *vn##_i=list_elem(args,ix);                                 \
-    if (!vn##_i) cfgfatal(loc,"make-public","need " what);             \
-    if (vn##_i->type!=t_string) cfgfatal(vn##_i->loc,"make-public",    \
-                                   what "must be string");             \
-    const char *vn=vn##_i->data.string
-
-    ARG(0,algname,"algorithm name");
-    ARG(1,b91d,"base91s-encoded public key");
+    CL_GET_STR_ARG(0,algname,"algorithm name");
+    CL_GET_STR_ARG(1,b91d,"base91s-encoded public key");
 
     const struct sigscheme_info *sch=sigscheme_lookup(algname);
     if (!sch) cfgfatal(algname_i->loc,"make-public",

diff --git a/util.h b/util.h
index 1086ad8d2daf6a6dd4d2a0f6953b87cfb987d8fc..3929abe366b90365bca126fa917f83df0b7dd587 100644 (file)
--- a/util.h
+++ b/util.h
@@ -265,6 +265,13 @@ async_linebuf_read(struct pollfd *pfd, struct buffer_if *buf,
 
 /*----- some handy macros -----*/
 
+#define CL_GET_STR_ARG(ix,vn,what)                                     \
+    item_t *vn##_i=list_elem(args,ix);                                 \
+    if (!vn##_i) cfgfatal(loc,"make-public","need " what);             \
+    if (vn##_i->type!=t_string) cfgfatal(vn##_i->loc,"make-public",    \
+                                   what "must be string");             \
+    const char *vn=vn##_i->data.string
+
 #define MINMAX(ae,be,op) ({                    \
        typeof((ae)) a=(ae);                    \
        typeof((be)) b=(be);                    \