X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=pubkeys.c;h=efcfa77fc31d717ab9a93d79edc312e1d16be121;hb=873f2f7629c89196a9b855e4baa8b118286a617d;hp=62f55259ef3efebd7ab9e1793155a72334582135;hpb=b9b111d4ea26e6f5c5110a25ef763b5930465f43;p=secnet.git

diff --git a/pubkeys.c b/pubkeys.c
index 62f5525..efcfa77 100644
--- 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",