From 0c2454de46ca94b16be8c6c258caea13550b92a1 Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Fri, 13 Sep 2019 09:32:49 -0400 Subject: [PATCH] shut up stupid analyzer --- src/lib/server/cf_file.c | 4 ---- src/lib/server/cf_file.h | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/lib/server/cf_file.c b/src/lib/server/cf_file.c index 51b164c7a167..ecc31e9a2259 100644 --- a/src/lib/server/cf_file.c +++ b/src/lib/server/cf_file.c @@ -985,10 +985,6 @@ static int process_template(CONF_SECTION *parent, char const *ptr, char *buff[st return -1; } -#ifdef __clang_analyzer__ - if (!ptr) return NULL; -#endif - ci = cf_reference_item(parent_cs, templatecs, buff[2]); if (!ci || (ci->type != CONF_ITEM_SECTION)) { ERROR("%s[%d]: Reference \"%s\" not found", filename, lineno, buff[2]); diff --git a/src/lib/server/cf_file.h b/src/lib/server/cf_file.h index bbe7080e6931..f241a9e813d3 100644 --- a/src/lib/server/cf_file.h +++ b/src/lib/server/cf_file.h @@ -63,7 +63,7 @@ int cf_section_write(FILE *fp, CONF_SECTION *cs, int depth); /* * Misc */ -CONF_ITEM *cf_reference_item(CONF_SECTION const *parentcs, CONF_SECTION const *outercs, char const *ptr) CC_HINT(nonnull(2,3)); +CONF_ITEM *cf_reference_item(CONF_SECTION const *parentcs, CONF_SECTION const *outercs, char const *ptr); char const *cf_expand_variables(char const *filename, int lineno, CONF_SECTION *outer_cs, char *output, size_t outsize,