X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/3386088d5af4d4c61faa12ae29560e2c5bd43304..5903c6ff59527362e869fedb565c56935ce8dd68:/src/src/lookups/sqlite.c diff --git a/src/src/lookups/sqlite.c b/src/src/lookups/sqlite.c index bb92c8c18..0b01fdbce 100644 --- a/src/src/lookups/sqlite.c +++ b/src/src/lookups/sqlite.c @@ -23,7 +23,7 @@ sqlite_open(uschar *filename, uschar **errmsg) sqlite3 *db = NULL; int ret; -ret = sqlite3_open((char *)filename, &db); +ret = sqlite3_open(CS filename, &db); if (ret != 0) { *errmsg = (void *)sqlite3_errmsg(db); @@ -55,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) { @@ -81,19 +81,19 @@ return 0; static int sqlite_find(void *handle, uschar *filename, const uschar *query, int length, - uschar **result, uschar **errmsg, BOOL *do_cache) + uschar **result, uschar **errmsg, uint *do_cache) { int ret; struct strbuf res = { NULL, 0, 0 }; -ret = sqlite3_exec(handle, (char *)query, sqlite_callback, &res, (char **)errmsg); +ret = sqlite3_exec(handle, CS query, sqlite_callback, &res, (char **)errmsg); if (ret != SQLITE_OK) { debug_printf("sqlite3_exec failed: %s\n", *errmsg); return FAIL; } -if (res.string == NULL) *do_cache = FALSE; +if (res.string == NULL) *do_cache = 0; *result = res.string; return OK;