Remove an unreachable test from wal.c.

FossilOrigin-Name: 7162c45673d1068d1fda55a70207a3cd77575502

diff --git a/manifest b/manifest
index 0d85543999e104bcf7eeb5d7b93d218248e5b928..acd8923f3f18f65dad582300a298f0ec7a9180f4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Add\sa\snote\sto\sthe\sdocumentation\sof\ssqlite3_wal_hook()\sto\ssay\snot\sto\sreturn\sSQLITE_ROW\sor\sSQLITE_DONE.\sOr\sany\sother\svalue\sthat\sis\snot\sa\svalid\sSQLite\serror\scode.
-D 2010-05-15T10:24:46
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Remove\san\sunreachable\stest\sfrom\swal.c.
+D 2010-05-17T20:16:50
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -224,7 +227,7 @@ F src/vdbeblob.c 5327132a42a91e8b7acfb60b9d2c3b1c5c863e0e
 F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
 F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
-F src/wal.c b59d841e78e11b0d37b2194b3522a855799a4d9a
+F src/wal.c 431efda4869ddb638b24766a7d18d991c24d7517
 F src/wal.h 434f76f51225bb614e43ccb6bd2341541ba6a06e
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 75fee9e255b62f773fcadd1d1f25b6f63ac7a356
@@ -813,7 +816,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P b9af4ad2efadfb2fb9e338dc081a6231f1536700
-R 284d8e3bf78e8e6d0ac2492e7d80e5c4
-U dan
-Z 5bf74290745d630f4082cd4abfc62978
+P 2f0b6cbf7b4fa31242ff4f6163226c22ae4f8c9b
+R 7fb7237f7cf75c7f2142fed93e1579c3
+U drh
+Z b90378a7ace398b5187db17b58e2bc66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFL8aQ0oxKgR168RlERApL2AJ4wVJZwrdX7MS1WzLfMTqmgqDeb/ACgjOZE
+fBG/ZxGxX4UDuZw3gdpyiIc=
+=ewZb
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 137260e688192b863fdcb3e7a54c64519e2cac74..a7858946b2d8e3564681c8d60cf19c64884bdc5e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2f0b6cbf7b4fa31242ff4f6163226c22ae4f8c9b
\ No newline at end of file
+7162c45673d1068d1fda55a70207a3cd77575502
\ No newline at end of file

diff --git a/src/wal.c b/src/wal.c
index df35577706d29a78e06cb09aa7b3cd91a5d6f9f6..4f296e050963d3d81aaecf074337aea8ea59f42c 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -1374,10 +1374,8 @@ int sqlite3WalFrames(
     i64 iOffset = walFrameOffset(iFrame+1, nPgsz);
 
     assert( isCommit );
+    assert( iSegment>0 );
 
-    if( iSegment<SQLITE_DEFAULT_SECTOR_SIZE ){
-      iSegment = SQLITE_DEFAULT_SECTOR_SIZE;
-    }
     iSegment = (((iOffset+iSegment-1)/iSegment) * iSegment);
     while( iOffset<iSegment ){
       walEncodeFrame(aCksum,pLast->pgno,nTruncate,nPgsz,pLast->pData,aFrame);