From: mistachkin Date: Fri, 28 Jul 2017 22:13:26 +0000 (+0000) Subject: Fix harmless compiler warning. X-Git-Tag: version-3.20.0~3^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6285fab686c8ed97b81dbaadf69ada23cfee6af;p=thirdparty%2Fsqlite.git Fix harmless compiler warning. FossilOrigin-Name: 3286e1a07b0693049a07f0865bf93749c461ea8f6d1175ec2d1642886673d8ac --- diff --git a/manifest b/manifest index 80a229dc9a..e453d501e9 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Enhance\sthe\slike\soptimization\sso\sthat\sit\sworks\swith\san\sESCAPE\sclause. -D 2017-07-27T20:24:29.258 +C Fix\sharmless\scompiler\swarning. +D 2017-07-28T22:13:26.143 F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016 @@ -417,7 +417,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 F src/insert.c b88a58ff7eb99365b3ff163a5771c7e5db09f43997a8c5303588056ab33bc4eb F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e F src/loadext.c 20865b183bb8a3723d59cf1efffc3c50217eb452c1021d077b908c94da26b0b2 -F src/main.c 5edd1774438f3b83d5a83b9ff0aee660d5752089ad768961ff10d80cae7a9ba1 +F src/main.c 42f6a2660c7a1d643cc7e863d2dcd630c6aa1e8343f5478b0592120ab84c97ba F src/malloc.c e20bb2b48abec52d3faf01cce12e8b4f95973755fafec98d45162dfdab111978 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de @@ -1637,7 +1637,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 0645f25c79c1b2af1fd3a02b44090329d456e373d91f6c284b8fbcb929e03a5d -R a1b40de685cc5a3c342ce6c1e88c465d -U drh -Z 1c2383ec54a238a2bc71d05955866da3 +P f5d330f495d07a704e115595bbdf5422ddb68fd8191114c5a12c9c873d983f7c +R 52c41da07e87e817b0e7a61462870900 +U mistachkin +Z 7aff7bef71ab9d5a20c01c7b7861ab02 diff --git a/manifest.uuid b/manifest.uuid index fd98f738db..a03665ecbd 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f5d330f495d07a704e115595bbdf5422ddb68fd8191114c5a12c9c873d983f7c \ No newline at end of file +3286e1a07b0693049a07f0865bf93749c461ea8f6d1175ec2d1642886673d8ac \ No newline at end of file diff --git a/src/main.c b/src/main.c index 0337ab7f25..2d81358370 100644 --- a/src/main.c +++ b/src/main.c @@ -824,7 +824,7 @@ int sqlite3_db_config(sqlite3 *db, int op, ...){ if( aFlagOp[i].op==op ){ int onoff = va_arg(ap, int); int *pRes = va_arg(ap, int*); - int oldFlags = db->flags; + u32 oldFlags = db->flags; if( onoff>0 ){ db->flags |= aFlagOp[i].mask; }else if( onoff==0 ){