From e3a7c5cfee46cb11e54183d6a53883d56f6b48db Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Wed, 6 Nov 2024 12:03:39 +0000 Subject: [PATCH] constification --- src/src/functions.h | 13 +++++++------ src/src/match.c | 4 ++-- src/src/readconf.c | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/src/functions.h b/src/src/functions.h index ace6d4018..a8c546efd 100644 --- a/src/src/functions.h +++ b/src/src/functions.h @@ -312,11 +312,12 @@ extern gstring * malware_show_supported(gstring *); extern int match_address_list(const uschar *, BOOL, BOOL, const uschar **, unsigned int *, int, int, const uschar **); extern int match_address_list_basic(const uschar *, const uschar **, int); -extern int match_check_list(const uschar **, int, tree_node **, unsigned int **, - int(*)(void *, const uschar *, const uschar **, uschar **), void *, int, - const uschar *, const uschar **); -extern int match_isinlist(const uschar *, const uschar **, int, tree_node **, - unsigned int *, int, BOOL, const uschar **); +extern int match_check_list(const uschar * const *, int, tree_node **, + unsigned int **, int(*)(void *, const uschar *, + const uschar **, uschar **), + void *, int, const uschar *, const uschar **); +extern int match_isinlist(const uschar *, const uschar * const *, int, + tree_node **, unsigned int *, int, BOOL, const uschar **); extern int match_check_string(const uschar *, const uschar *, int, mcs_flags, const uschar **); @@ -398,7 +399,7 @@ extern int rda_is_filter(const uschar *); extern BOOL readconf_depends(driver_instance *, uschar *); extern void readconf_driver_init(driver_instance **, driver_info **, int, void *, int, optionlist *, int, const uschar *); -extern const uschar *readconf_find_option(void *); +extern const uschar *readconf_find_option(const void *); extern void readconf_main(BOOL); extern void readconf_options_from_list(optionlist *, unsigned, const uschar *, uschar *); extern BOOL readconf_print(const uschar *, const uschar *, BOOL); diff --git a/src/src/match.c b/src/src/match.c index 60d9cad1f..252efc6c2 100644 --- a/src/src/match.c +++ b/src/src/match.c @@ -419,7 +419,7 @@ Returns: OK if matched a non-negated item */ int -match_check_list(const uschar **listptr, int sep, tree_node **anchorptr, +match_check_list(const uschar * const * listptr, int sep, tree_node **anchorptr, unsigned int **cache_ptr, int (*func)(void *,const uschar *,const uschar **,uschar **), void *arg, int type, const uschar *name, const uschar **valueptr) { @@ -991,7 +991,7 @@ Returns: OK if matched a non-negated item */ int -match_isinlist(const uschar *s, const uschar **listptr, int sep, +match_isinlist(const uschar * s, const uschar * const * listptr, int sep, tree_node **anchorptr, unsigned int *cache_bits, int type, BOOL caseless, const uschar **valueptr) { diff --git a/src/src/readconf.c b/src/src/readconf.c index 5ef776fea..960008953 100644 --- a/src/src/readconf.c +++ b/src/src/readconf.c @@ -609,7 +609,7 @@ Returns: the option name, or an empty string */ const uschar * -readconf_find_option(void * listptr) +readconf_find_option(const void * listptr) { uschar * list = * USS listptr; const uschar * name = NULL, * drname = NULL; -- 2.30.2