mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Suppress compiler warnings. Fix a bug in IO error detection on windows. (CVS 3564)

Browse Source 
FossilOrigin-Name: daed2bab00ea3952d2d4e5182ca07653b9d80ac2
This commit is contained in:
drh 2007-01-05 14:38:54 +00:00
parent 24c9a2eeb2
commit aedd892e0c
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C In\sthe\sbtree.c,\swhen\sreleasing\sthe\spage1\slock,\sfirst\smake\ssure\sthe\npager\shas\snot\sreset\sand\sreleased\sthe\slock\salready.\s\sThis\sfixes\sa\sbug\nintroduced\sby\s(3549).\s(CVS\s3563)
D 2007-01-05T02:00:47
C Suppress\scompiler\swarnings.\s\sFix\sa\sbug\sin\sIO\serror\sdetection\son\swindows.\s(CVS\s3564)
D 2007-01-05T14:38:55
F Makefile.in 63a71177ed4355c829229affe11167bd28c85884
F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@ -83,7 +83,7 @@ F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
F src/os_unix.c 9fbbd8ab0a6b3992370ba0f3aae11feff2a78c96
F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
F src/os_win.c 92df146ed964401969831a19bb490d76ce4de4c0
F src/os_win.c 300709309613efa6529236d9aa5fc60d3920c4ff
F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
F src/pager.c d6ad66eb119602cb2e6a097f8f635372ba677d23
F src/pager.h 2e6d42f4ae004ae748a037b8468112b851c447a7
@ -91,7 +91,7 @@ F src/parse.y 2f571c5f6219428d7fb08737db3d113742b1cceb
F src/pragma.c fd4df6cf0857dd78a7cb5be5f9805419b53ae7a0
F src/prepare.c f4f45b4560defbb566cf8255763625d2c09a8023
F src/printf.c b179b6ed12f793e028dd169e2e2e2b2a37eedc63
F src/random.c d40f8d356cecbd351ccfab6eaedd7ec1b54f5261
F src/random.c 6119474a6f6917f708c1dee25b9a8e519a620e88
F src/select.c 52f09127b53697b1a95835a9b0db9309cca8079f
F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
F src/shell.c f270a7996e30ef997500f2447d4c4a27b8809f0c
@ -424,7 +424,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
P 06216d0d3be38bfabda9f5f450a5eaccd20b52b9
R 88a6682f27b71c9c3c9099b414f32bc9
P 36a2db96efa7f227c0a39e58fd83d56cc491472b
R 183f1098460ebbbe4a129f04691aed7c
U drh
Z 6815214498fce035470cac08b531711b
Z 3650492f3e5498adfa58ed2b5474eab6

2
manifest.uuid
View File

@ -1 +1 @@
36a2db96efa7f227c0a39e58fd83d56cc491472b
daed2bab00ea3952d2d4e5182ca07653b9d80ac2

4
src/os_win.c
View File

@ -1003,12 +1003,10 @@ static int winRead(OsFile *id, void *pBuf, int amt){
SimulateIOError(return SQLITE_IOERR);
TRACE3("READ %d lock=%d\n", ((winFile*)id)->h, ((winFile*)id)->locktype);
if( !ReadFile(((winFile*)id)->h, pBuf, amt, &got, 0) ){
got = -1;
return SQLITE_IOERR_READ;
}
if( got==(DWORD)amt ){
return SQLITE_OK;
}else if( got<0 ){
return SQLITE_IOERR_READ;
}else{
memset(&((char*)pBuf)[got], 0, amt-got);
return SQLITE_IOERR_SHORT_READ;

4
src/random.c
View File

@ -15,7 +15,7 @@
** Random numbers are used by some of the database backends in order
** to generate random integer keys for tables or random filenames.
**
** $Id: random.c,v 1.15 2006/01/06 14:32:20 drh Exp $
** $Id: random.c,v 1.16 2007/01/05 14:38:56 drh Exp $
*/
#include "sqliteInt.h"
#include "os.h"
@ -37,7 +37,7 @@
** (Later): Actually, OP_NewRowid does not depend on a good source of
** randomness any more. But we will leave this code in all the same.
*/
static int randomByte(){
static int randomByte(void){
unsigned char t;
/* All threads share a single random number generator.