From 57b17a67d24bbf0375dda97cc511e52d8ba34837 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 11 Oct 2016 17:02:12 +1100 Subject: [PATCH] don't require lctx to be non NULL (cherry picked from commit 3793d848bd636d63050339ce18d8eae1e5eff16a) --- lib/isccfg/parser.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c index 5b1edbd91b..fc2df4aac4 100644 --- a/lib/isccfg/parser.c +++ b/lib/isccfg/parser.c @@ -432,7 +432,6 @@ cfg_parser_create(isc_mem_t *mctx, isc_log_t *lctx, cfg_parser_t **ret) { isc_lexspecials_t specials; REQUIRE(mctx != NULL); - REQUIRE(lctx != NULL); REQUIRE(ret != NULL && *ret == NULL); pctx = isc_mem_get(mctx, sizeof(*pctx)); @@ -2749,10 +2748,9 @@ cfg_obj_log(const cfg_obj_t *obj, isc_log_t *lctx, int level, char msgbuf[2048]; REQUIRE(obj != NULL); - REQUIRE(lctx != NULL); REQUIRE(fmt != NULL); - if (! isc_log_wouldlog(lctx, level)) + if (! isc_log_wouldlog(lctx, l)) return; va_start(ap, fmt);