From: drh <drh@noemail.net>
Date: Fri, 20 Apr 2018 20:09:22 +0000 (+0000)
Subject: Fix a harmless compiler warning.
X-Git-Tag: version-3.24.0~124
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b8bd8430271e38f6700f4a5dcefb8bb88182b80;p=thirdparty%2Fsqlite.git

Fix a harmless compiler warning.

FossilOrigin-Name: d2ab24f59d92527fe503fa7dc2128078fbc4dd2d2c1148effa9ea1957ab19940
---

diff --git a/manifest b/manifest
index 4040315166..b38c494186 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sthe\suse\sof\sstatement\sjournals\son\sDELETEs\sof\sa\ssingle\srow\swithout\ntriggers\sor\sforeign\skeys.
-D 2018-04-20T19:46:52.676
+C Fix\sa\sharmless\scompiler\swarning.
+D 2018-04-20T20:09:22.155
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439
@@ -557,7 +557,7 @@ F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c 5b0c661a85f783d35b9883830736eeb63be4aefc4f6b7d9cd081d48782c041e2
 F src/treeview.c 14d5d1254702ec96876aa52642cb31548612384134970409fae333b25b39d6bb
 F src/trigger.c 4ace6d1d5ba9a89822deb287317f33c810440526eafe185c2d8a48c31df1e995
-F src/update.c 9db686e67ba51bb44f268620943a9c4bb43c3e6f44a97b80dc29005382a9e2da
+F src/update.c 78c2e91bcc598f00d5770903c7db55ddb7ffa8ddd91aa1b77e6bbc1a773b45fc
 F src/upsert.c ae4a4823b45c4daf87e8aea8c0f582a8844763271f5ed54ee5956c4c612734f4
 F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
 F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
@@ -1724,7 +1724,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 2772404b8c570caf3c31d2b0530cf347a24f6f60e220e726c086537b38ebfa85
-R ee450c0b69f4dcb2215df3be5c0b6054
+P 20bf5800808ea02b2aa4bf01a380926784c0e7514a2c73ca303cac1f5c732ae0
+R c4d0464d41166a1353ad8fa1877326ad
 U drh
-Z 19b2fe2aad3c7a4f7bc67e8d88be66a9
+Z 2c474dfea923266db5087d809c736452
diff --git a/manifest.uuid b/manifest.uuid
index e14a2a169d..07db5ea041 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-20bf5800808ea02b2aa4bf01a380926784c0e7514a2c73ca303cac1f5c732ae0
\ No newline at end of file
+d2ab24f59d92527fe503fa7dc2128078fbc4dd2d2c1148effa9ea1957ab19940
\ No newline at end of file
diff --git a/src/update.c b/src/update.c
index a98bfa7d49..a0d20c0511 100644
--- a/src/update.c
+++ b/src/update.c
@@ -391,7 +391,7 @@ void sqlite3Update(
 #endif
 
   /* Jump to labelBreak to abandon further processing of this UPDATE */
-  labelBreak = sqlite3VdbeMakeLabel(v);
+  labelContinue = labelBreak = sqlite3VdbeMakeLabel(v);
 
   /* Not an UPSERT.  Normal processing.  Begin by
   ** initialize the count of updated rows */
@@ -428,7 +428,6 @@ void sqlite3Update(
     */
     pWInfo = 0;
     eOnePass = ONEPASS_SINGLE;
-    labelContinue = labelBreak;
     sqlite3ExprIfFalse(pParse, pWhere, labelBreak, SQLITE_JUMPIFNULL);
   }else{
     /* Begin the database scan. 
@@ -526,9 +525,7 @@ void sqlite3Update(
         sqlite3VdbeAddOp4Int(v, OP_NotFound, iDataCur, labelBreak, regKey,nKey);
         VdbeCoverageNeverTaken(v);
       }
-      if( eOnePass==ONEPASS_SINGLE ){
-        labelContinue = labelBreak;
-      }else{
+      if( eOnePass!=ONEPASS_SINGLE ){
         labelContinue = sqlite3VdbeMakeLabel(v);
       }
       sqlite3VdbeAddOp2(v, OP_IsNull, pPk ? regKey : regOldRowid, labelBreak);