mirror of
https://github.com/sqlite/sqlite.git
synced 2025-08-07 02:42:48 +03:00
Omit some code that is not used when SQLITE_SECURE_DELETE is defined.
FossilOrigin-Name: 5a9e746357aa8edeef6b89f01e19cd57555bef32
This commit is contained in:
24
manifest
24
manifest
@@ -1,5 +1,8 @@
|
|||||||
C Improved\sshell\s"dot"\scommand\sargument\shandling.\s\sTicket\s[f12a9eeedc].
|
-----BEGIN PGP SIGNED MESSAGE-----
|
||||||
D 2009-11-06T17:20:17
|
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.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
|
||||||
F Makefile.in a77dfde96ad86aafd3f71651a4333a104debe86a
|
F Makefile.in a77dfde96ad86aafd3f71651a4333a104debe86a
|
||||||
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
|
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
|
||||||
@@ -148,7 +151,7 @@ F src/os_common.h 8c61457df58f1a4bd5f5adc3e90e01b37bf7afbc
|
|||||||
F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
|
F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
|
||||||
F src/os_unix.c bdd6ca0932dcb51c344081aff430bcc71c14db7f
|
F src/os_unix.c bdd6ca0932dcb51c344081aff430bcc71c14db7f
|
||||||
F src/os_win.c 5ffab20249a61e0625f869efe157fa009747039b
|
F src/os_win.c 5ffab20249a61e0625f869efe157fa009747039b
|
||||||
F src/pager.c 5b5a980aec52a3864bba8600c003b6ad6f4112c2
|
F src/pager.c c7c20ff0023c6af588b1176f690fdb2d037a6470
|
||||||
F src/pager.h 11852d044c86cf5a9d6e34171fb0c4fcf1f6265f
|
F src/pager.h 11852d044c86cf5a9d6e34171fb0c4fcf1f6265f
|
||||||
F src/parse.y 0204f0dfe8974dc2a0d46eb9ab98a433a1f963d6
|
F src/parse.y 0204f0dfe8974dc2a0d46eb9ab98a433a1f963d6
|
||||||
F src/pcache.c c92ffd4f3e1279b3766854c6d18b5bf4aac0d1fa
|
F src/pcache.c c92ffd4f3e1279b3766854c6d18b5bf4aac0d1fa
|
||||||
@@ -762,7 +765,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
|
|||||||
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
|
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
|
||||||
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
|
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
|
||||||
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
|
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
|
||||||
P ddb71cd9ed395804a13dc136bb7688a7627c798f
|
P 9fb699193378bf812ef97889adc0b1a98ad56d5b
|
||||||
R c0a38f994aec3b7175756a6deebcbc05
|
R fdf5a8d657aeaba08e7c5c254f1f6526
|
||||||
U shaneh
|
U drh
|
||||||
Z 41814e7c3b68e673756d4c35a2fa402a
|
Z 7e5ce34c05f0188b286b3ae061a48378
|
||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
Version: GnuPG v1.4.6 (GNU/Linux)
|
||||||
|
|
||||||
|
iD8DBQFK+L4ZoxKgR168RlERAtZAAKCCTC8tli73ESEGoRpFvsk/j0ZXlgCdEm8J
|
||||||
|
c0lB3B9PrEPRFrLUhti7U7A=
|
||||||
|
=s4Q4
|
||||||
|
-----END PGP SIGNATURE-----
|
||||||
|
@@ -1 +1 @@
|
|||||||
9fb699193378bf812ef97889adc0b1a98ad56d5b
|
5a9e746357aa8edeef6b89f01e19cd57555bef32
|
@@ -2873,7 +2873,9 @@ static int pager_write_pagelist(PgHdr *pList){
|
|||||||
** any such pages to the file.
|
** any such pages to the file.
|
||||||
**
|
**
|
||||||
** Also, do not write out any page that has the PGHDR_DONT_WRITE flag
|
** 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) ){
|
if( pgno<=pPager->dbSize && 0==(pList->flags&PGHDR_DONT_WRITE) ){
|
||||||
i64 offset = (pgno-1)*(i64)pPager->pageSize; /* Offset to write */
|
i64 offset = (pgno-1)*(i64)pPager->pageSize; /* Offset to write */
|
||||||
@@ -4382,6 +4384,7 @@ int sqlite3PagerIswriteable(DbPage *pPg){
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef SQLITE_SECURE_DELETE
|
||||||
/*
|
/*
|
||||||
** A call to this routine tells the pager that it is not necessary to
|
** 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
|
** write the information on page pPg back to the disk, even though
|
||||||
@@ -4407,6 +4410,7 @@ void sqlite3PagerDontWrite(PgHdr *pPg){
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif /* !defined(SQLITE_SECURE_DELETE) */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** This routine is called to increment the value of the database file
|
** This routine is called to increment the value of the database file
|
||||||
|
Reference in New Issue
Block a user