database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

Cleanup unused function in pager.c. This is the conclusion of the fix

Browse Source 
to ticket #2518. We believe the fix is complete and correct. (CVS 4165)

FossilOrigin-Name: 31dba1e933c523a47fdd007c2c7492133dfe72f2
This commit is contained in:
drh
2007-07-20 00:33:36 +00:00
parent 3260548b53
commit b100391318
3 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Disable\stests\sthat\suse\sthe\sprogress\shandler\swhen\sthe\sprogress\shandler\nis\sdisabled\sat\scompile-time.\s\sFollowup\sto\sticket\s#2497.\s(CVS\s4164) C Cleanup\sunused\sfunction\sin\spager.c.\s\sThis\sis\sthe\sconclusion\sof\sthe\sfix\r\nto\sticket\s#2518.\sWe\sbelieve\sthe\sfix\sis\scomplete\sand\scorrect.\s(CVS\s4165)
D 2007-07-19T22:30:19 D 2007-07-20T00:33:36
F Makefile.in 0c0e53720f658c7a551046442dd7afba0b72bfbe F Makefile.in 0c0e53720f658c7a551046442dd7afba0b72bfbe
F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -97,7 +97,7 @@ F src/os_unix.c 4099d05dc4b01997e80a289f3c6a220688e5cff5
F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
F src/os_win.c d868d5f9e95ec9c1b9e2a30c54c996053db6dddd F src/os_win.c d868d5f9e95ec9c1b9e2a30c54c996053db6dddd
F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
F src/pager.c ce52bc1b1292d34848352cb74fa413f2e3114d88 F src/pager.c 79a4587cc5e84a7ca1e211fa273bb2071a78447b
F src/pager.h 94110a5570dca30d54a883e880a3633b2e4c05ae F src/pager.h 94110a5570dca30d54a883e880a3633b2e4c05ae
F src/parse.y ad2ce25665be7f7303137f774a4e3e72e0d036ff F src/parse.y ad2ce25665be7f7303137f774a4e3e72e0d036ff
F src/pragma.c 7914a6b9ea05f158800116dfcae11e52ab8e39c4 F src/pragma.c 7914a6b9ea05f158800116dfcae11e52ab8e39c4
@@ -518,7 +518,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
P 75263797e29af437290c09e85cd5fd2aea08694f P cbc56fd4ec60d08a13a3aa181d044e726c49ef3c
R 88bfb3ffc2b0493ef8bd7f2ac71548aa R 50eec5fb77fce5bbf8eeff15756e0201
U drh U drh
Z daa0db0bb2263a39aabea796f2500945 Z 34289d7bcf73b986a79d68c15ee2a407

2
manifest.uuid
View File

@@ -1 +1 @@
cbc56fd4ec60d08a13a3aa181d044e726c49ef3c 31dba1e933c523a47fdd007c2c7492133dfe72f2

15
src/pager.c
View File

@@ -18,7 +18,7 @@
** file simultaneously, or one process from reading the database while ** file simultaneously, or one process from reading the database while
** another is writing. ** another is writing.
** **
** @(#) $Id: pager.c,v 1.350 2007/07/19 16:35:17 drh Exp $ ** @(#) $Id: pager.c,v 1.351 2007/07/20 00:33:36 drh Exp $
*/ */
#ifndef SQLITE_OMIT_DISKIO #ifndef SQLITE_OMIT_DISKIO
#include "sqliteInt.h" #include "sqliteInt.h"
@@ -550,17 +550,6 @@ static int write32bits(OsFile *fd, u32 val){
return sqlite3OsWrite(fd, ac, 4); return sqlite3OsWrite(fd, ac, 4);
} }
/*
** Read a 32-bit integer at offset 'offset' from the page identified by
** page header 'p'.
*/
static u32 retrieve32bits(PgHdr *p, int offset){
unsigned char *ac;
ac = &((unsigned char*)PGHDR_TO_DATA(p))[offset];
return sqlite3Get4byte(ac);
}
/* /*
** This function should be called when an error occurs within the pager ** This function should be called when an error occurs within the pager
** code. The first argument is a pointer to the pager structure, the ** code. The first argument is a pointer to the pager structure, the
@@ -3873,7 +3862,7 @@ static int pager_incr_changecounter(Pager *pPager){
if( rc!=SQLITE_OK ) return rc; if( rc!=SQLITE_OK ) return rc;
/* Increment the value just read and write it back to byte 24. */ /* Increment the value just read and write it back to byte 24. */
change_counter = sqlite3Get4byte(pPager->dbFileVers); change_counter = sqlite3Get4byte((u8*)pPager->dbFileVers);
change_counter++; change_counter++;
put32bits(((char*)PGHDR_TO_DATA(pPgHdr))+24, change_counter); put32bits(((char*)PGHDR_TO_DATA(pPgHdr))+24, change_counter);
/* Release the page reference. */ /* Release the page reference. */