From a424f86288eb20ce7a1fbf30fec18980d69c4e24 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sat, 18 Oct 2014 11:30:24 +0000 Subject: [PATCH] The filter file array can't be NULL so don't bother checking The intention was checking whether or not filters are available, but that's a premature optimization for an unlikely scenario, so the bogus checks can be dropped without replacement. CID 66389, CID 66385, CID 66375. --- filters.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/filters.c b/filters.c index f1eacd33..1fc1c476 100644 --- a/filters.c +++ b/filters.c @@ -1,4 +1,4 @@ -const char filters_rcs[] = "$Id: filters.c,v 1.190 2014/10/18 11:26:48 fabiankeil Exp $"; +const char filters_rcs[] = "$Id: filters.c,v 1.191 2014/10/18 11:28:36 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/filters.c,v $ @@ -2009,7 +2009,6 @@ static filter_function_ptr get_filter_function(const struct client_state *csp) * the content type and action settings. */ if ((csp->content_type & CT_TEXT) && - (csp->rlist != NULL) && (!list_is_empty(csp->action->multi[ACTION_MULTI_FILTER]))) { filter_function = pcrs_filter_response; @@ -2222,7 +2221,6 @@ char *execute_content_filters(struct client_state *csp) #ifdef FEATURE_EXTERNAL_FILTERS if ((csp->content_type & CT_TEXT) && - (csp->rlist != NULL) && !list_is_empty(csp->action->multi[ACTION_MULTI_EXTERNAL_FILTER])) { struct list_entry *filtername; @@ -2627,7 +2625,6 @@ int content_requires_filtering(struct client_state *csp) * the content type and action settings. */ if ((csp->content_type & CT_TEXT) && - (csp->rlist != NULL) && (!list_is_empty(csp->action->multi[ACTION_MULTI_FILTER]) || !list_is_empty(csp->action->multi[ACTION_MULTI_EXTERNAL_FILTER]))) { -- 2.39.2