From ae1415c988328a15aad5e917463ccd689156049b Mon Sep 17 00:00:00 2001 From: tb Date: Fri, 2 Feb 2024 16:41:41 +0000 Subject: [PATCH] parser: no need to overload err1 twice. err2 is only used in the second call to proc_parser_mft_proc() and right before it there is already an error overload. ok job --- usr.sbin/rpki-client/parser.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/usr.sbin/rpki-client/parser.c b/usr.sbin/rpki-client/parser.c index 9288e5e3e2b..c095ff5b305 100644 --- a/usr.sbin/rpki-client/parser.c +++ b/usr.sbin/rpki-client/parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.c,v 1.119 2024/02/02 16:15:08 job Exp $ */ +/* $OpenBSD: parser.c,v 1.120 2024/02/02 16:41:41 tb Exp $ */ /* * Copyright (c) 2019 Claudio Jeker * Copyright (c) 2019 Kristaps Dzonsons @@ -426,11 +426,6 @@ proc_parser_mft(struct entity *entp, struct mft **mp, char **crlfile, &err1); } - /* overload error from temp file if it is set */ - if (mft1 == NULL && mft2 == NULL) - if (err1 != NULL) - err2 = err1; - if (mft1 != NULL) { *mp = proc_parser_mft_post(file1, mft1, err1, &warned); if (*mp == NULL) { @@ -451,6 +446,7 @@ proc_parser_mft(struct entity *entp, struct mft **mp, char **crlfile, file = file1; *crlfile = crl1file; } else { + /* overload error from temp file */ if (err2 == NULL) err2 = err1; *mp = proc_parser_mft_post(file2, mft2, err2, &warned); -- 2.20.1