From: drh <drh@noemail.net>
Date: Sat, 21 Sep 2019 17:31:03 +0000 (+0000)
Subject: Fix harmless compiler warnings.
X-Git-Tag: version-3.30.0~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e39f388eb1b66df91a59038abaa6566306f1cbb7;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings.

FossilOrigin-Name: 8ea1dc727d391b15d0c4fa858ff68d5b8a63dde46408f24027dac8d28f044cbd
---

diff --git a/ext/misc/json1.c b/ext/misc/json1.c
index 251fd14afc..2827d72212 100644
--- a/ext/misc/json1.c
+++ b/ext/misc/json1.c
@@ -1868,7 +1868,7 @@ static void jsonGroupInverse(
   int argc,
   sqlite3_value **argv
 ){
-  int i;
+  unsigned int i;
   int inStr = 0;
   int nNest = 0;
   char *z;
diff --git a/manifest b/manifest
index 016ac84b33..d02fbc7dad 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\sSQLite\sto\somit\sredundant\sORDER\sBY\ssorts\sin\sthe\scase\swhere\sa\sSELECT\sstatement\shas\sGROUP\sBY\sand\sORDER\sBY\sclauses\sthat\suse\sthe\ssame\sexpressions,\seven\swhen\sthe\sORDER\sBY\sexpressions\sare\smarked\s"DESC".
-D 2019-09-21T15:44:12.308
+C Fix\sharmless\scompiler\swarnings.
+D 2019-09-21T17:31:03.751
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -295,7 +295,7 @@ F ext/misc/fileio.c 288e7230e0fe464d71b0694e2d8bdd3a353118ac2e31da3964b95f460f09
 F ext/misc/fossildelta.c 7708651072eb5620ab21bbfb518d184f27b2c29c0131b09b9a2d8852a8016430
 F ext/misc/fuzzer.c c4e27daf41433a64cad5265cd27dbcb891147e9994d0422200ce81ce9a54b625
 F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
-F ext/misc/json1.c 061950860e6b8b7af6fc40029bf673fb97887ab04d6a33950c32a0ced6775577
+F ext/misc/json1.c 66ccdfa63283adb2c015019b431eeee1f5af40a78d9aad10afd22c2c6db0e3b0
 F ext/misc/memstat.c 3017a0832c645c0f8c773435620d663855f04690172316bd127270d1a7523d4d
 F ext/misc/memtrace.c 7c0d115d2ef716ad0ba632c91e05bd119cb16c1aedf3bec9f06196ead2d5537b
 F ext/misc/memvfs.c ab36f49e02ebcdf85a1e08dc4d8599ea8f343e073ac9e0bca18a98b7e1ec9567
@@ -525,7 +525,7 @@ F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 9891cf5fd155bb199f8b1ff5d1429b9f70484487f4c455bba94348d4cb6f829f
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
-F src/select.c 4cd8fc7b0cd24896d4723f1cf657b94d13dd1bbcf615f0e1a0d907a7430d97ff
+F src/select.c 059edc066d70a1e910145150887e796bb835e1f73b316cdf8db83c6aaa68f075
 F src/shell.c.in 68698630c21c5489fb3dc961a3ab3840e726c3c01e475dab96055788a7b6e5e6
 F src/sqlite.h.in 5725a6b20190a1e8d662077a1c1c8ea889ad7be90dd803f914c2de226f5fe6ab
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1845,7 +1845,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 c17078af6046ba3cb0d7819c915a800c851d7368e13d149140db2a124df32bab
-R d08bed1f29c6cbaa789c8e3b4453a904
-U dan
-Z 9c97555303c041a619dcecf838a96110
+P 20f7951bb238ddc0b8932a55145df426b6fdf7b8631e069345902c853c90f191
+R c52711fcaf249ac6e7fe9562189271f0
+U drh
+Z b7e3cb6f50d76663f3ab01f529c279d9
diff --git a/manifest.uuid b/manifest.uuid
index b25bac9b3a..6b92a21e83 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-20f7951bb238ddc0b8932a55145df426b6fdf7b8631e069345902c853c90f191
\ No newline at end of file
+8ea1dc727d391b15d0c4fa858ff68d5b8a63dde46408f24027dac8d28f044cbd
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 0eded752be..f28bdf9377 100644
--- a/src/select.c
+++ b/src/select.c
@@ -6233,15 +6233,15 @@ int sqlite3Select(
       ** ORDER BY and GROUP BY clauses are the same by setting the orderByGrp
       ** variable.  */
       if( sSort.pOrderBy && pGroupBy->nExpr==sSort.pOrderBy->nExpr ){
-        int i;
+        int ii;
         /* The GROUP BY processing doesn't care whether rows are delivered in
         ** ASC or DESC order - only that each group is returned contiguously.
         ** So set the ASC/DESC flags in the GROUP BY to match those in the 
         ** ORDER BY to maximize the chances of rows being delivered in an 
         ** order that makes the ORDER BY redundant.  */
-        for(i=0; i<pGroupBy->nExpr; i++){
-          u8 sortFlags = sSort.pOrderBy->a[i].sortFlags & KEYINFO_ORDER_DESC;
-          pGroupBy->a[i].sortFlags = sortFlags;
+        for(ii=0; ii<pGroupBy->nExpr; ii++){
+          u8 sortFlags = sSort.pOrderBy->a[ii].sortFlags & KEYINFO_ORDER_DESC;
+          pGroupBy->a[ii].sortFlags = sortFlags;
         }
         if( sqlite3ExprListCompare(pGroupBy, sSort.pOrderBy, -1)==0 ){
           orderByGrp = 1;