Omit some code that is not used when SQLITE_SECURE_DELETE is defined.

FossilOrigin-Name: 5a9e746357aa8edeef6b89f01e19cd57555bef32

diff --git a/manifest b/manifest
index 188ad32a1d85910d7c0ad3924818d3a021f85e4a..15b8c36539d51f3b74003fc06a975e376248cf45 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Improved\sshell\s"dot"\scommand\sargument\shandling.\s\sTicket\s[f12a9eeedc].
-D 2009-11-06T17:20:17
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Omit\ssome\scode\sthat\sis\snot\sused\swhen\sSQLITE_SECURE_DELETE\sis\sdefined.
+D 2009-11-10T01:12:51
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a77dfde96ad86aafd3f71651a4333a104debe86a
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -148,7 +151,7 @@ F src/os_common.h 8c61457df58f1a4bd5f5adc3e90e01b37bf7afbc
 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
 F src/os_unix.c bdd6ca0932dcb51c344081aff430bcc71c14db7f
 F src/os_win.c 5ffab20249a61e0625f869efe157fa009747039b
-F src/pager.c 5b5a980aec52a3864bba8600c003b6ad6f4112c2
+F src/pager.c c7c20ff0023c6af588b1176f690fdb2d037a6470
 F src/pager.h 11852d044c86cf5a9d6e34171fb0c4fcf1f6265f
 F src/parse.y 0204f0dfe8974dc2a0d46eb9ab98a433a1f963d6
 F src/pcache.c c92ffd4f3e1279b3766854c6d18b5bf4aac0d1fa
@@ -762,7 +765,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P ddb71cd9ed395804a13dc136bb7688a7627c798f
-R c0a38f994aec3b7175756a6deebcbc05
-U shaneh
-Z 41814e7c3b68e673756d4c35a2fa402a
+P 9fb699193378bf812ef97889adc0b1a98ad56d5b
+R fdf5a8d657aeaba08e7c5c254f1f6526
+U drh
+Z 7e5ce34c05f0188b286b3ae061a48378
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFK+L4ZoxKgR168RlERAtZAAKCCTC8tli73ESEGoRpFvsk/j0ZXlgCdEm8J
+c0lB3B9PrEPRFrLUhti7U7A=
+=s4Q4
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 3dfba0da24df6af05869830696c77428d2c6221b..94961403d6e6ab73369b75c958d217b370365551 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9fb699193378bf812ef97889adc0b1a98ad56d5b
\ No newline at end of file
+5a9e746357aa8edeef6b89f01e19cd57555bef32
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 1c8fd831432e8d185b7d32bd996bf11a51f09546..447e3bc8b6a58b532d65f64a511ba472803ecf33 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -2873,7 +2873,9 @@ static int pager_write_pagelist(PgHdr *pList){
     ** any such pages to the file.
     **
     ** Also, do not write out any page that has the PGHDR_DONT_WRITE flag
-    ** set (set by sqlite3PagerDontWrite()).
+    ** set (set by sqlite3PagerDontWrite()).  Note that if compiled with
+    ** SQLITE_SECURE_DELETE the PGHDR_DONT_WRITE bit is never set and so
+    ** the second test is always true.
     */
     if( pgno<=pPager->dbSize && 0==(pList->flags&PGHDR_DONT_WRITE) ){
       i64 offset = (pgno-1)*(i64)pPager->pageSize;   /* Offset to write */
@@ -4382,6 +4384,7 @@ int sqlite3PagerIswriteable(DbPage *pPg){
 }
 #endif
 
+#ifndef SQLITE_SECURE_DELETE
 /*
 ** A call to this routine tells the pager that it is not necessary to
 ** write the information on page pPg back to the disk, even though
@@ -4407,6 +4410,7 @@ void sqlite3PagerDontWrite(PgHdr *pPg){
 #endif
   }
 }
+#endif /* !defined(SQLITE_SECURE_DELETE) */
 
 /*
 ** This routine is called to increment the value of the database file