Disable code used only by the codec when the codec is not deployed.

FossilOrigin-Name: 2c90276e340aa19d78d2e33c9f759f8eda0b82a3

diff --git a/manifest b/manifest
index 89e50e174d9c747989bd70a8e16d53fc7d4ab67a..eff616811cb7d04ba5a3dfac32bea54ff7d53f77 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Add\scodec\ssupport\sto\swal\smode.
-D 2010-06-22T15:18:44
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Disable\scode\sused\sonly\sby\sthe\scodec\swhen\sthe\scodec\sis\snot\sdeployed.
+D 2010-06-22T21:15:50
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -156,8 +159,8 @@ F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 665876d5eec7585226b0a1cf5e18098de2b2da19
 F src/os_unix.c 5231a75a3799872b1250bc70c0e6a1a5960bc865
 F src/os_win.c 73608839342de32280cb378d3c2fc85a5dd80bd2
-F src/pager.c 0517562e70c2a4bc2f3ff0762e4e19f94ed24c24
-F src/pager.h 051ed521fb0ecac631d60e9ad4b40b829639aabf
+F src/pager.c 54719676081c6ffe48d333698c3fc4ec2cb184f3
+F src/pager.h 879fdde5a102d2f21a3135d6f647530b21c2796c
 F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
 F src/pcache.c 1e9aa2dbc0845b52e1b51cc39753b6d1e041cb07
 F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
@@ -226,7 +229,7 @@ F src/vdbeblob.c 258a6010ba7a82b72b327fb24c55790655689256
 F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
 F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
-F src/wal.c dcc18b615711353f4ff872a9428e9a249427da93
+F src/wal.c 70ffd43c93adb3c28c175f7ac5e63db3b5469821
 F src/wal.h 4ace25262452d17e7d3ec970c89ee17794004008
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 1c895bef33d0dfc7ed90fb1f74120435d210ea56
@@ -825,7 +828,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 4775b8f9a9d9b66fcd5abf3af111fcad249e662e
-R 2ecd2087dd0de003ea8ae917ed134748
-U dan
-Z f5174ae54201a5e81880758a2f3085e2
+P 393741eba353d5d242b8e3c96db3ea2b92228036
+R a98e0c1a959f76ef6bea94ee96e38ea8
+U drh
+Z c41882a67704e43aa1f9a5f9eff0a10d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFMISgJoxKgR168RlERAqKAAJ4lHvGOXiCW0m/XZuzHlM4sH/bgLQCbB6c7
+O+DRDmTpPwGjNikY9THJ3Z0=
+=I8ep
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 8926e863e389b64fb2eb91f9e77809d4edd74189..a6b08e2e040e01734e9f285ccd47fd6a6427831b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-393741eba353d5d242b8e3c96db3ea2b92228036
\ No newline at end of file
+2c90276e340aa19d78d2e33c9f759f8eda0b82a3
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index cf0a0643d732c931b897437f35c3dc9acec5f817..a0902a86237dd84af9bb2aa4bcad9c75e66d5b03 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -6115,8 +6115,8 @@ void *sqlite3PagerCodec(PgHdr *pPg){
   CODEC2(pPg->pPager, pPg->pData, pPg->pgno, 6, return 0, aData);
   return aData;
 }
-#endif
+#endif /* SQLITE_HAS_CODEC */
 
-#endif
+#endif /* !SQLITE_OMIT_WAL */
 
 #endif /* SQLITE_OMIT_DISKIO */

diff --git a/src/pager.h b/src/pager.h
index f45049ade70c1fab55219a31ed88522e06e1d1c9..6036827e43f504fd70e2e3bf73b5d3362bc698b5 100644 (file)
--- a/src/pager.h
+++ b/src/pager.h
@@ -159,8 +159,6 @@ void sqlite3PagerTruncateImage(Pager*,Pgno);
 
 #if defined(SQLITE_HAS_CODEC) && !defined(SQLITE_OMIT_WAL)
 void *sqlite3PagerCodec(DbPage *);
-#else
-#define sqlite3PagerCodec(x) (x->pData)
 #endif
 
 /* Functions to support testing and debugging. */

diff --git a/src/wal.c b/src/wal.c
index 460df4e3e51f4c0296da881adbffcca98c73ac47..0175c852ca24d130ff407431c48acf8821f1b187 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -2293,7 +2293,11 @@ int sqlite3WalFrames(
     
     /* Populate and write the frame header */
     nDbsize = (isCommit && p->pDirty==0) ? nTruncate : 0;
+#if defined(SQLITE_HAS_CODEC)
     if( (pData = sqlite3PagerCodec(p))==0 ) return SQLITE_NOMEM;
+#else
+    pData = p->pData;
+#endif
     walEncodeFrame(pWal, p->pgno, nDbsize, pData, aFrame);
     rc = sqlite3OsWrite(pWal->pWalFd, aFrame, sizeof(aFrame), iOffset);
     if( rc!=SQLITE_OK ){
@@ -2319,7 +2323,11 @@ int sqlite3WalFrames(
     iSegment = (((iOffset+iSegment-1)/iSegment) * iSegment);
     while( iOffset<iSegment ){
       void *pData;
+#if defined(SQLITE_HAS_CODEC)
       if( (pData = sqlite3PagerCodec(pLast))==0 ) return SQLITE_NOMEM;
+#else
+      pData = pLast->pData;
+#endif
       walEncodeFrame(pWal, pLast->pgno, nTruncate, pData, aFrame);
       rc = sqlite3OsWrite(pWal->pWalFd, aFrame, sizeof(aFrame), iOffset);
       if( rc!=SQLITE_OK ){