X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/6545de78cb822ab5db97a2f16fe7a42cc9488bd8..c2f669a4994192344613569e198c7b503d46d45e:/src/src/lookups/sqlite.c diff --git a/src/src/lookups/sqlite.c b/src/src/lookups/sqlite.c index e679973b3..6e7b015bc 100644 --- a/src/src/lookups/sqlite.c +++ b/src/src/lookups/sqlite.c @@ -1,10 +1,8 @@ -/* $Cambridge: exim/src/src/lookups/sqlite.c,v 1.5 2009/11/16 19:50:38 nm4 Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2009 */ +/* Copyright (c) University of Cambridge 1995 - 2015 */ /* See the file NOTICE for conditions of use and distribution. */ #include "../exim.h" @@ -57,7 +55,7 @@ int i; /* For second and subsequent results, insert \n */ if (res->string != NULL) - res->string = string_cat(res->string, &res->size, &res->len, US"\n", 1); + res->string = string_catn(res->string, &res->size, &res->len, US"\n", 1); if (argc > 1) { @@ -82,8 +80,8 @@ return 0; static int -sqlite_find(void *handle, uschar *filename, uschar *query, int length, - uschar **result, uschar **errmsg, BOOL *do_cache) +sqlite_find(void *handle, uschar *filename, const uschar *query, int length, + uschar **result, uschar **errmsg, uint *do_cache) { int ret; struct strbuf res = { NULL, 0, 0 }; @@ -95,7 +93,7 @@ if (ret != SQLITE_OK) return FAIL; } -if (res.string == NULL) *do_cache = FALSE; +if (res.string == NULL) *do_cache = 0; *result = res.string; return OK;