From 62f82d6852a7c1f058befc26890e5ed3e6393a4a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 23 Nov 2019 17:07:11 +0000 Subject: [PATCH] rsa: LDPUBFATAL: Move & before lc into callers We are going to want to add a new call site that passes 0. And format it nicely. Signed-off-by: Ian Jackson --- rsa.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rsa.c b/rsa.c index 7d50249..3770aa6 100644 --- a/rsa.c +++ b/rsa.c @@ -328,7 +328,10 @@ static void rsapub_dispose(void *sst) { #define RSAPUB_LOADCORE_DEFBN(ix,en,what) \ const char *en##s, struct cloc en##_loc, -#define LDPUBFATAL(lc,...) ({load_err(l,&lc,0,0,__VA_ARGS__); goto error_out;}) +#define LDPUBFATAL(lc,...) ({ \ + load_err(l,(lc),0,0,__VA_ARGS__); \ + goto error_out; \ + }) static struct rsapub *rsa_loadpub_core(RSAPUB_BNS(RSAPUB_LOADCORE_DEFBN) struct load_ctx *l) @@ -352,11 +355,11 @@ static struct rsapub *rsa_loadpub_core(RSAPUB_BNS(RSAPUB_LOADCORE_DEFBN) #define RSAPUB_LOADCORE_GETBN(ix,en,what) \ if (mpz_init_set_str(&st->en,en##s,10)!=0) { \ - LDPUBFATAL(en##_loc, what " \"%s\" is not a " \ + LDPUBFATAL(&en##_loc, what " \"%s\" is not a " \ "decimal number string\n",en##s); \ } \ if (mpz_sizeinbase(&st->en, 256) > RSA_MAX_MODBYTES) { \ - LDPUBFATAL(en##_loc, "implausibly large " what "\n"); \ + LDPUBFATAL(&en##_loc, "implausibly large " what "\n"); \ } RSAPUB_BNS(RSAPUB_LOADCORE_GETBN) -- 2.30.2