From: Jeremy Harris Date: Thu, 20 Nov 2014 16:14:47 +0000 (+0000) Subject: Const-ification X-Git-Tag: exim-4_85_RC2~22 X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/b8b1b5cb847ae5c40195584e321eb70afbdca113 Const-ification --- diff --git a/src/src/functions.h b/src/src/functions.h index 07d0eb413..2074bb2f1 100644 --- a/src/src/functions.h +++ b/src/src/functions.h @@ -72,7 +72,7 @@ extern BOOL tls_is_name_for_cert(uschar *, void *); # endif # ifdef EXPERIMENTAL_DANE -extern int tlsa_lookup(host_item *, dns_answer *, BOOL, BOOL *); +extern int tlsa_lookup(const host_item *, dns_answer *, BOOL, BOOL *); # endif #endif /*SUPPORT_TLS*/ @@ -224,7 +224,7 @@ extern int match_address_list(uschar *, BOOL, BOOL, uschar **, unsigned int *, int, int, uschar **); extern int match_check_list(uschar **, int, tree_node **, unsigned int **, int(*)(void *, uschar *, uschar **, uschar **), void *, int, - uschar *, uschar **); + const uschar *, uschar **); extern int match_isinlist(uschar *, uschar **, int, tree_node **, unsigned int *, int, BOOL, uschar **); extern int match_check_string(uschar *, uschar *, int, BOOL, BOOL, BOOL, diff --git a/src/src/match.c b/src/src/match.c index 97a098205..604157da3 100644 --- a/src/src/match.c +++ b/src/src/match.c @@ -438,7 +438,7 @@ Returns: OK if matched a non-negated item int match_check_list(uschar **listptr, int sep, tree_node **anchorptr, unsigned int **cache_ptr, int (*func)(void *,uschar *,uschar **,uschar **), - void *arg, int type, uschar *name, uschar **valueptr) + void *arg, int type, const uschar *name, uschar **valueptr) { int yield = OK; unsigned int *original_cache_bits = *cache_ptr; diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c index b1094b1c2..9aa655e82 100644 --- a/src/src/tls-openssl.c +++ b/src/src/tls-openssl.c @@ -172,7 +172,7 @@ Returns: OK/DEFER/FAIL */ static int -tls_error(uschar *prefix, host_item *host, uschar *msg) +tls_error(uschar * prefix, const host_item * host, uschar * msg) { if (!msg) { @@ -541,7 +541,7 @@ Returns: TRUE if OK (nothing to set up, or setup worked) */ static BOOL -init_dh(SSL_CTX *sctx, uschar *dhparam, host_item *host) +init_dh(SSL_CTX *sctx, uschar *dhparam, const host_item *host) { BIO *bio; DH *dh; diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c index 0d12d17aa..2fb1e599c 100644 --- a/src/src/transports/smtp.c +++ b/src/src/transports/smtp.c @@ -1167,7 +1167,7 @@ return FALSE; #ifdef EXPERIMENTAL_DANE int -tlsa_lookup(host_item * host, dns_answer * dnsa, +tlsa_lookup(const host_item * host, dns_answer * dnsa, BOOL dane_required, BOOL * dane) { /* move this out to host.c given the similarity to dns_lookup() ? */