From 134e527091d86f164b42a47b3777ac71a335ff18 Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 7 Feb 2017 21:00:44 +0000 Subject: [PATCH] Fix harmless compiler warnings in dbfuzz. FossilOrigin-Name: 61242267824135a9d5438ec15e3352a2f21dc2fc --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/dbfuzz.c | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index 2284814a6d..cf619e924e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sharmless\scompiler\swarnings\sin\skvtest.c -D 2017-02-07T20:57:00.794 +C Fix\sharmless\scompiler\swarnings\sin\sdbfuzz. +D 2017-02-07T21:00:44.802 F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc ba953c8921fc7e18333f61898007206de7e23964 @@ -635,7 +635,7 @@ F test/ctime.test ff6c38e822459d6ca743c34901caf57740b08b54 F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856 F test/cursorhint2.test 8457e93d97f665f23f97cdbc8477d16e3480331b F test/date.test a6a5a48b90907bca9fbcc79a30be5a715c1ab2fc -F test/dbfuzz.c 8cc2bdb818b4483a052f9f80f96be74cbd9a6e1d +F test/dbfuzz.c 73047c920d6210e5912c87cdffd9a1c281d4252e F test/dbselftest.c 4bf86fe04dc2d0d58dabc5e6b7a06fa4ef7827ea F test/dbstatus.test 73149851b3aff14fc6db478e58f9083a66422cf5 F test/dbstatus2.test e93ab03bfae6d62d4d935f20de928c19ca0ed0ab @@ -1555,7 +1555,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P e68829c9bbc69bf4a0dc057e0a6e977f2fac79be -R e8e95a0beaf31ff9600f2388a71f8dcd +P db6b39937dd9d6fcd5fcc582c8dd529caad755da +R f5b20543ad5a9de57f328e5cb19dc17f U drh -Z 62b1a410058a970df83f462c97cdf484 +Z 556fccfd2bf9ea9a682f73b7b4dda1ae diff --git a/manifest.uuid b/manifest.uuid index 473f751fff..db9339c4af 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -db6b39937dd9d6fcd5fcc582c8dd529caad755da \ No newline at end of file +61242267824135a9d5438ec15e3352a2f21dc2fc \ No newline at end of file diff --git a/test/dbfuzz.c b/test/dbfuzz.c index 2de97c35cb..ca1c6ea217 100644 --- a/test/dbfuzz.c +++ b/test/dbfuzz.c @@ -458,7 +458,7 @@ static void StrAppend(Str *p, const char *z){ sqlite3_uint64 nNew; if( p->oomErr ) return; nNew = p->nAlloc*2 + 100 + n; - zNew = sqlite3_realloc(p->z, nNew); + zNew = sqlite3_realloc64(p->z, nNew); if( zNew==0 ){ sqlite3_free(p->z); memset(p, 0, sizeof(*p)); @@ -468,7 +468,7 @@ static void StrAppend(Str *p, const char *z){ p->z = zNew; p->nAlloc = nNew; } - memcpy(p->z + p->n, z, n); + memcpy(p->z + p->n, z, (int)n); p->n += n; p->z[p->n] = 0; } @@ -647,7 +647,7 @@ static void runSql(sqlite3 *db, const char *zSql, unsigned runFlags){ int main(int argc, char **argv){ int i; /* Loop counter */ int nDb = 0; /* Number of databases to fuzz */ - const char **azDb = 0; /* Names of the databases (limit: 20) */ + char **azDb = 0; /* Names of the databases (limit: 20) */ int verboseFlag = 0; /* True for extra output */ int noLookaside = 0; /* Disable lookaside if true */ int vdbeLimitFlag = 0; /* Stop after 100,000 VDBE ops */ @@ -660,7 +660,7 @@ int main(int argc, char **argv){ unsigned runFlags = 0; /* Flags passed to runSql */ for(i=1; i