Remove an always-true conditional. Replace it with an assert().

FossilOrigin-Name: 1c2f0f8477bcf251fe874a2cfae4d7a403cb88ff

diff --git a/manifest b/manifest
index e6ae3960447e807aa6a540fd4127b9a0648a921a..36e2f96988d284349b209029a9f3602e0088945d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sVerifyCookie\sinstructions\sto\s"DROP\sXXX\sIF\sEXISTS"\sstatements\sif\sthe\sspecified\sdatabase\sobject\sdoes\snot\sexist\swhen\sthe\sstatement\sis\sprepared.
-D 2011-04-09T17:32:58.132
+C Remove\san\salways-true\sconditional.\s\sReplace\sit\swith\san\sassert().
+D 2011-04-09T17:53:30.201
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -118,7 +118,7 @@ F src/alter.c 280f5c04b11b492703a342222b3de0a999445280
 F src/analyze.c a425d62e8fa9ebcb4359ab84ff0c62c6563d2e2a
 F src/attach.c 7f97ca76ef2453440170929531a9c778267c0830
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
-F src/backup.c 8d738af17e87eb6fcf2dab8b26153a918a114e48
+F src/backup.c 986c15232757f2873dff35ee3b35cbf935fc573c
 F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
 F src/btree.c 6a9164af8a2ef4612ee30b253635a9bd8e5e1b1b
@@ -927,7 +927,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P b9dbd9936191666c3fc9889e938344a82cc03aeb
-R 0b11aa72c3fba72615e4990e1f23fca6
-U dan
-Z 1024ea561694dc92b045ac4bc887de85
+P a46f32900a013aa6bb2dad2a9ed3ce00ab2493fd
+R 82deaf50c44bacb7e77b8358435cc0c9
+U drh
+Z 1d377ca5bb92e1cc67ae34d0dbcea9e6

diff --git a/manifest.uuid b/manifest.uuid
index 06d24001e87b23d297cb3de7f8e7238cd79f3d6b..e9b55b99fe2d3f7862d8ab6bbd9c15b4e0001130 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a46f32900a013aa6bb2dad2a9ed3ce00ab2493fd
\ No newline at end of file
+1c2f0f8477bcf251fe874a2cfae4d7a403cb88ff
\ No newline at end of file

diff --git a/src/backup.c b/src/backup.c
index 5e45a002584ea14d8e193e18b9380ce838f68b82..4d7ae31834cf6fd06565f342cec047b56ba1f706 100644 (file)
--- a/src/backup.c
+++ b/src/backup.c
@@ -623,9 +623,10 @@ void sqlite3BackupUpdate(sqlite3_backup *pBackup, Pgno iPage, const u8 *aData){
       ** the new data into the backup.
       */
       int rc;
-      if( p->pDestDb ) sqlite3_mutex_enter(p->pDestDb->mutex);
+      assert( p->pDestDb );
+      sqlite3_mutex_enter(p->pDestDb->mutex);
       rc = backupOnePage(p, iPage, aData);
-      if( p->pDestDb ) sqlite3_mutex_leave(p->pDestDb->mutex);
+      sqlite3_mutex_leave(p->pDestDb->mutex);
       assert( rc!=SQLITE_BUSY && rc!=SQLITE_LOCKED );
       if( rc!=SQLITE_OK ){
         p->rc = rc;