X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Flookups%2Flf_sqlperform.c;h=cc894e0ed89083725d8f59198de7e2d58e8feaf4;hb=53ef3d8498e76615b531f2f61604334e9884ba03;hp=2d7f326840972cf124b4136e6fbe50f55b8501f1;hpb=3386088d5af4d4c61faa12ae29560e2c5bd43304;p=exim.git diff --git a/src/src/lookups/lf_sqlperform.c b/src/src/lookups/lf_sqlperform.c index 2d7f32684..cc894e0ed 100644 --- a/src/src/lookups/lf_sqlperform.c +++ b/src/src/lookups/lf_sqlperform.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2015 */ +/* Copyright (c) University of Cambridge 1995 - 2018 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -27,7 +27,7 @@ Arguments: query the query result where to pass back the result errmsg where to pass back an error message - do_cache to be set FALSE if data is changed + do_cache to be set zero if data is changed func the lookup function to call Returns: the return from the lookup function, or DEFER @@ -36,8 +36,8 @@ Returns: the return from the lookup function, or DEFER int lf_sqlperform(const uschar *name, const uschar *optionname, const uschar *optserverlist, const uschar *query, - uschar **result, uschar **errmsg, BOOL *do_cache, - int(*fn)(const uschar *, uschar *, uschar **, uschar **, BOOL *, BOOL *)) + uschar **result, uschar **errmsg, uint *do_cache, + int(*fn)(const uschar *, uschar *, uschar **, uschar **, BOOL *, uint *)) { int sep, rc; uschar *server; @@ -45,7 +45,7 @@ const uschar *serverlist; uschar buffer[512]; BOOL defer_break = FALSE; -DEBUG(D_lookup) debug_printf("%s query: %s\n", name, query); +DEBUG(D_lookup) debug_printf_indent("%s query: %s\n", name, query); /* Handle queries that do not have server information at the start. */ @@ -98,7 +98,7 @@ else return DEFER; } - qserverlist = string_sprintf("%.*s", ss - s, s); + qserverlist = string_sprintf("%.*s", (int)(ss - s), s); qsep = 0; while ((qserver = string_nextinlist(&qserverlist, &qsep, qbuffer,