From 2b01e5359b79cfa9b31296700eb7fc5ae69162c5 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Fri, 22 Dec 2017 11:34:20 +0000 Subject: [PATCH] Constification --- src/src/lookups/nis.c | 8 ++++---- src/src/transports/smtp_socks.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/src/lookups/nis.c b/src/src/lookups/nis.c index 278ee09c9..d3f0480ac 100644 --- a/src/src/lookups/nis.c +++ b/src/src/lookups/nis.c @@ -41,14 +41,14 @@ for nis0 because they are so short it isn't worth trying to use any common code. */ static int -nis_find(void *handle, uschar *filename, uschar *keystring, int length, +nis_find(void *handle, uschar *filename, const uschar *keystring, int length, uschar **result, uschar **errmsg, uint *do_cache) { int rc; uschar *nis_data; int nis_data_length; do_cache = do_cache; /* Placate picky compilers */ -if ((rc = yp_match(CS handle, CS filename, CS keystring, length, +if ((rc = yp_match(CCS handle, CCS filename, CCS keystring, length, CSS &nis_data, &nis_data_length)) == 0) { *result = string_copy(nis_data); @@ -67,14 +67,14 @@ return (rc == YPERR_KEY || rc == YPERR_MAP)? FAIL : DEFER; /* See local README for interface description. */ static int -nis0_find(void *handle, uschar *filename, uschar *keystring, int length, +nis0_find(void *handle, uschar *filename, const uschar *keystring, int length, uschar **result, uschar **errmsg, uint *do_cache) { int rc; uschar *nis_data; int nis_data_length; do_cache = do_cache; /* Placate picky compilers */ -if ((rc = yp_match(CS handle, CS filename, CS keystring, length + 1, +if ((rc = yp_match(CCS handle, CCS filename, CCS keystring, length + 1, CSS &nis_data, &nis_data_length)) == 0) { *result = string_copy(nis_data); diff --git a/src/src/transports/smtp_socks.c b/src/src/transports/smtp_socks.c index 5eee220a5..1dc81a33b 100644 --- a/src/src/transports/smtp_socks.c +++ b/src/src/transports/smtp_socks.c @@ -87,11 +87,11 @@ else if (Ustrncmp(opt, "pass=", 5) == 0) else if (Ustrncmp(opt, "port=", 5) == 0) sob->port = atoi(opt + 5); else if (Ustrncmp(opt, "tmo=", 4) == 0) - sob->timeout = atoi(opt + 4); + sob->timeout = atoi(CCS opt + 4); else if (Ustrncmp(opt, "pri=", 4) == 0) - sob->priority = atoi(opt + 4); + sob->priority = atoi(CCS opt + 4); else if (Ustrncmp(opt, "weight=", 7) == 0) - sob->weight = atoi(opt + 7); + sob->weight = atoi(CCS opt + 7); return; } -- 2.30.2