#define FREE(b) ({ free((b)); (b)=0; })
struct load_ctx {
- void (*verror)(struct load_ctx *l, const struct cloc *loc,
+ void (*verror)(struct load_ctx *l, struct cloc loc,
FILE *maybe_f, bool_t unsup,
const char *message, va_list args);
bool_t (*postreadcheck)(struct load_ctx *l, FILE *f);
const char *what;
- struct cloc *loc;
+ struct cloc loc;
union {
struct {
struct log_if *log;
{
va_list al;
va_start(al,fmt);
- l->verror(l, maybe_loc ? maybe_loc : l->loc, maybe_f,unsup,fmt,al);
+ l->verror(l, maybe_loc ? *maybe_loc : l->loc, maybe_f,unsup,fmt,al);
va_end(al);
}
FORMAT(printf,5,0)
-static void verror_tryload(struct load_ctx *l, const struct cloc *loc,
+static void verror_tryload(struct load_ctx *l, struct cloc loc,
FILE *maybe_f, bool_t unsup,
const char *message, va_list args)
{
vslilog(l->u.tryload.log,class,message,args);
}
-static void verror_cfgfatal(struct load_ctx *l, const struct cloc *loc,
+static void verror_cfgfatal(struct load_ctx *l, struct cloc loc,
FILE *maybe_f, bool_t unsup,
const char *message, va_list args)
{
- vcfgfatal_maybefile(maybe_f,*l->loc,l->what,message,args);
+ vcfgfatal_maybefile(maybe_f,l->loc,l->what,message,args);
}
struct rsapriv {
static void rsapub_dispose(void *sst) {
struct rsapub *st=sst;
+ if (!st) return;
mpz_clear(&st->e);
mpz_clear(&st->n);
rsacommon_dispose(&st->common);
l->what="rsa1priv load";
l->verror=verror_tryload;
l->postreadcheck=postreadcheck_tryload;
- l->loc=&loc;
+ l->loc=loc;
l->u.tryload.log=log;
st=rsa_loadpriv_core(l,f,loc,False);
static bool_t postreadcheck_apply(struct load_ctx *l, FILE *f)
{
- cfgfile_postreadcheck(*l->loc,f);
+ cfgfile_postreadcheck(l->loc,f);
return True;
}
l->what="rsa-private";
l->verror=verror_cfgfatal;
l->postreadcheck=postreadcheck_apply;
- l->loc=&loc;
+ l->loc=loc;
/* Argument is filename pointing to SSH1 private key file */
i=list_elem(args,0);