database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-10-27 08:52:26 +03:00
Code Activity

Remove unused code from util.c. Enhance the trace output in os_unix.c. (CVS 2397)

Browse Source 
FossilOrigin-Name: f2f31919fdd181c79b86f849d46c60f1ed7a0db1
This commit is contained in:
drh
2005-03-18 14:03:15 +00:00
parent 072192dffa
commit e29b915e9b
4 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Fixed\sa\stypo\sin\salter3.test.\s(CVS\s2396) C Remove\sunused\scode\sfrom\sutil.c.\s\sEnhance\sthe\strace\soutput\sin\sos_unix.c.\s(CVS\s2397)
D 2005-03-17T12:33:14 D 2005-03-18T14:03:15
F Makefile.in 5c00d0037104de2a50ac7647a5f12769795957a3 F Makefile.in 5c00d0037104de2a50ac7647a5f12769795957a3
F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -48,7 +48,7 @@ F src/os.h 0c805df3df02b98eb78a7a86756c3cbd4e190939
F src/os_common.h 0e7f428ba0a6c40a61bc56c4e96f493231301b73 F src/os_common.h 0e7f428ba0a6c40a61bc56c4e96f493231301b73
F src/os_test.c 91e5f22dd89491e5e1554820e715805f43fa4ece F src/os_test.c 91e5f22dd89491e5e1554820e715805f43fa4ece
F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
F src/os_unix.c d4823c6b3dd86e8cbb6a8f9d2fd6c4b3e722f8ee F src/os_unix.c fba0167576f09e242afd4c4978e1d2944b1da8b5
F src/os_unix.h 40b2fd1d02cfa45d6c3dea25316fd019cf9fcb0c F src/os_unix.h 40b2fd1d02cfa45d6c3dea25316fd019cf9fcb0c
F src/os_win.c bddeae1c3299be0fbe47077dd4e98b786a067f71 F src/os_win.c bddeae1c3299be0fbe47077dd4e98b786a067f71
F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
@@ -73,7 +73,7 @@ F src/tokenize.c 103cbaa932c790f540f8eceb63cd3010e117bdff
F src/trigger.c 0c3ec8a6cb7176aaecc3978bfc34050ec1a852c4 F src/trigger.c 0c3ec8a6cb7176aaecc3978bfc34050ec1a852c4
F src/update.c 42823d00865c9fe4f01b3c62647858726345a28e F src/update.c 42823d00865c9fe4f01b3c62647858726345a28e
F src/utf.c bda5eb85039ef16f2d17004c1e18c96e1ab0a80c F src/utf.c bda5eb85039ef16f2d17004c1e18c96e1ab0a80c
F src/util.c a53b6fc6f09093ecba1ce593ca7cb1cb77b3a20b F src/util.c 02bc2750336b021b3f10e61538f665c4b0033b5d
F src/vacuum.c 5cf598003191bd91c17a64742bad8e46241698a8 F src/vacuum.c 5cf598003191bd91c17a64742bad8e46241698a8
F src/vdbe.c 086e4b42d57af68fceb8c04a6e4eed901777d942 F src/vdbe.c 086e4b42d57af68fceb8c04a6e4eed901777d942
F src/vdbe.h 7e307333d74e134eff237bb9d45fe764e544ad6a F src/vdbe.h 7e307333d74e134eff237bb9d45fe764e544ad6a
@@ -277,7 +277,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd
P 800fb3bf06f73af53af57f5b172c85406af374ad P 698be25d3e8f0eb2b5a4c6c7d20343b3c8a06134
R ba10e0ea6358a224f231b7ca767b2ccf R 8611ce54c1361038076da5f3886275d5
U drh U drh
Z 8dab2cd1f570ecdb07ff4ba5a2a7d53e Z d647977318d4fd6baeb9f9cedb4c633a

2
manifest.uuid
View File

@@ -1 +1 @@
698be25d3e8f0eb2b5a4c6c7d20343b3c8a06134 f2f31919fdd181c79b86f849d46c60f1ed7a0db1

4
src/os_unix.c
View File

@@ -644,7 +644,7 @@ int sqlite3OsRead(OsFile *id, void *pBuf, int amt){
TIMER_START; TIMER_START;
got = read(id->h, pBuf, amt); got = read(id->h, pBuf, amt);
TIMER_END; TIMER_END;
TRACE4("READ %-3d %7d %d\n", id->h, last_page, TIMER_ELAPSED); TRACE5("READ %-3d %5d %7d %d\n", id->h, got, last_page, TIMER_ELAPSED);
SEEK(0); SEEK(0);
/* if( got<0 ) got = 0; */ /* if( got<0 ) got = 0; */
if( got==amt ){ if( got==amt ){
@@ -670,7 +670,7 @@ int sqlite3OsWrite(OsFile *id, const void *pBuf, int amt){
pBuf = &((char*)pBuf)[wrote]; pBuf = &((char*)pBuf)[wrote];
} }
TIMER_END; TIMER_END;
TRACE4("WRITE %-3d %7d %d\n", id->h, last_page, TIMER_ELAPSED); TRACE5("WRITE %-3d %5d %7d %d\n", id->h, wrote, last_page, TIMER_ELAPSED);
SEEK(0); SEEK(0);
if( amt>0 ){ if( amt>0 ){
return SQLITE_FULL; return SQLITE_FULL;

15
src/util.c
View File

@@ -14,7 +14,7 @@
** This file contains functions for allocating memory, comparing ** This file contains functions for allocating memory, comparing
** strings, and stuff like that. ** strings, and stuff like that.
** **
** $Id: util.c,v 1.131 2005/03/10 12:35:46 drh Exp $ ** $Id: util.c,v 1.132 2005/03/18 14:03:15 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include <stdarg.h> #include <stdarg.h>
@@ -858,18 +858,6 @@ int sqlite3GetVarint32(const unsigned char *p, u32 *v){
u32 x; u32 x;
int n; int n;
unsigned char c; unsigned char c;
#if 0
if( ((c = p[0]) & 0x80)==0 ){
*v = c;
return 1;
}
x = c & 0x7f;
if( ((c = p[1]) & 0x80)==0 ){
*v = (x<<7) | c;
return 2;
}
x = (x<<7) | (c & 0x7f);
#else
if( ((signed char*)p)[0]>=0 ){ if( ((signed char*)p)[0]>=0 ){
*v = p[0]; *v = p[0];
return 1; return 1;
@@ -880,7 +868,6 @@ int sqlite3GetVarint32(const unsigned char *p, u32 *v){
return 2; return 2;
} }
x = (x<<7) | (p[1] & 0x7f); x = (x<<7) | (p[1] & 0x7f);
#endif
n = 2; n = 2;
do{ do{
x = (x<<7) | ((c = p[n++])&0x7f); x = (x<<7) | ((c = p[n++])&0x7f);