database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-15 11:41:13 +03:00
Code Activity

For error log messages generated by the Win32 native allocator, make sure the correct format specifier is used for the value returned by GetLastError().

Browse Source 
FossilOrigin-Name: 75a8a8c1b39725d36db627536d0c69401f8e0815
This commit is contained in:
mistachkin
2013-09-12 02:09:05 +00:00
parent 36ca5359dc
commit a9cb5be49a
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Fix\sa\scouple\smore\sharmless\scompiler\swarnings. C For\serror\slog\smessages\sgenerated\sby\sthe\sWin32\snative\sallocator,\smake\ssure\sthe\scorrect\sformat\sspecifier\sis\sused\sfor\sthe\svalue\sreturned\sby\sGetLastError().
D 2013-09-12T01:47:57.395 D 2013-09-12T02:09:05.258
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -203,7 +203,7 @@ F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be
F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
F src/os_unix.c 243fb37f47dc072fc59839ea241ff0a17c8d76e6 F src/os_unix.c 243fb37f47dc072fc59839ea241ff0a17c8d76e6
F src/os_win.c d18f670eeca4ab3da61230628d9042dfa282bd89 F src/os_win.c 0e73f891dd806b82a76d4e19179c532f02236b86
F src/pager.c 2aa4444ffe86e9282d03bc349a4a5e49bd77c0e8 F src/pager.c 2aa4444ffe86e9282d03bc349a4a5e49bd77c0e8
F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c
F src/parse.y 27c6b4138497d6f8360ba7847da6ed48033f957f F src/parse.y 27c6b4138497d6f8360ba7847da6ed48033f957f
@@ -1112,7 +1112,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
P 117fa5fbc9bed1a7b982c8ddc21b7e228905ccb4 P 59708674f66e06c9c31c1a24f2f1c51f0bf4fa3e
R 381ae7788d46844675761732daa8c2f7 R 1ed3fe4d70c0b22924a418f004301c6c
U mistachkin U mistachkin
Z 423fbd0e140db731445f28d728ebdbaa Z 0449c470c02ad9774090312d2090be91

2
manifest.uuid
View File

@@ -1 +1 @@
59708674f66e06c9c31c1a24f2f1c51f0bf4fa3e 75a8a8c1b39725d36db627536d0c69401f8e0815

14
src/os_win.c
View File

@@ -1168,7 +1168,7 @@ static void *winMemMalloc(int nBytes){
assert( nBytes>=0 ); assert( nBytes>=0 );
p = osHeapAlloc(hHeap, SQLITE_WIN32_HEAP_FLAGS, (SIZE_T)nBytes); p = osHeapAlloc(hHeap, SQLITE_WIN32_HEAP_FLAGS, (SIZE_T)nBytes);
if( !p ){ if( !p ){
sqlite3_log(SQLITE_NOMEM, "failed to HeapAlloc %u bytes (%d), heap=%p", sqlite3_log(SQLITE_NOMEM, "failed to HeapAlloc %u bytes (%lu), heap=%p",
nBytes, osGetLastError(), (void*)hHeap); nBytes, osGetLastError(), (void*)hHeap);
} }
return p; return p;
@@ -1189,7 +1189,7 @@ static void winMemFree(void *pPrior){
#endif #endif
if( !pPrior ) return; /* Passing NULL to HeapFree is undefined. */ if( !pPrior ) return; /* Passing NULL to HeapFree is undefined. */
if( !osHeapFree(hHeap, SQLITE_WIN32_HEAP_FLAGS, pPrior) ){ if( !osHeapFree(hHeap, SQLITE_WIN32_HEAP_FLAGS, pPrior) ){
sqlite3_log(SQLITE_NOMEM, "failed to HeapFree block %p (%d), heap=%p", sqlite3_log(SQLITE_NOMEM, "failed to HeapFree block %p (%lu), heap=%p",
pPrior, osGetLastError(), (void*)hHeap); pPrior, osGetLastError(), (void*)hHeap);
} }
} }
@@ -1215,7 +1215,7 @@ static void *winMemRealloc(void *pPrior, int nBytes){
p = osHeapReAlloc(hHeap, SQLITE_WIN32_HEAP_FLAGS, pPrior, (SIZE_T)nBytes); p = osHeapReAlloc(hHeap, SQLITE_WIN32_HEAP_FLAGS, pPrior, (SIZE_T)nBytes);
} }
if( !p ){ if( !p ){
sqlite3_log(SQLITE_NOMEM, "failed to %s %u bytes (%d), heap=%p", sqlite3_log(SQLITE_NOMEM, "failed to %s %u bytes (%lu), heap=%p",
pPrior ? "HeapReAlloc" : "HeapAlloc", nBytes, osGetLastError(), pPrior ? "HeapReAlloc" : "HeapAlloc", nBytes, osGetLastError(),
(void*)hHeap); (void*)hHeap);
} }
@@ -1239,7 +1239,7 @@ static int winMemSize(void *p){
if( !p ) return 0; if( !p ) return 0;
n = osHeapSize(hHeap, SQLITE_WIN32_HEAP_FLAGS, p); n = osHeapSize(hHeap, SQLITE_WIN32_HEAP_FLAGS, p);
if( n==(SIZE_T)-1 ){ if( n==(SIZE_T)-1 ){
sqlite3_log(SQLITE_NOMEM, "failed to HeapSize block %p (%d), heap=%p", sqlite3_log(SQLITE_NOMEM, "failed to HeapSize block %p (%lu), heap=%p",
p, osGetLastError(), (void*)hHeap); p, osGetLastError(), (void*)hHeap);
return 0; return 0;
} }
@@ -1269,7 +1269,7 @@ static int winMemInit(void *pAppData){
SQLITE_WIN32_HEAP_MAX_SIZE); SQLITE_WIN32_HEAP_MAX_SIZE);
if( !pWinMemData->hHeap ){ if( !pWinMemData->hHeap ){
sqlite3_log(SQLITE_NOMEM, sqlite3_log(SQLITE_NOMEM,
"failed to HeapCreate (%d), flags=%u, initSize=%u, maxSize=%u", "failed to HeapCreate (%lu), flags=%u, initSize=%u, maxSize=%u",
osGetLastError(), SQLITE_WIN32_HEAP_FLAGS, osGetLastError(), SQLITE_WIN32_HEAP_FLAGS,
SQLITE_WIN32_HEAP_INIT_SIZE, SQLITE_WIN32_HEAP_MAX_SIZE); SQLITE_WIN32_HEAP_INIT_SIZE, SQLITE_WIN32_HEAP_MAX_SIZE);
return SQLITE_NOMEM; return SQLITE_NOMEM;
@@ -1281,7 +1281,7 @@ static int winMemInit(void *pAppData){
pWinMemData->hHeap = osGetProcessHeap(); pWinMemData->hHeap = osGetProcessHeap();
if( !pWinMemData->hHeap ){ if( !pWinMemData->hHeap ){
sqlite3_log(SQLITE_NOMEM, sqlite3_log(SQLITE_NOMEM,
"failed to GetProcessHeap (%d)", osGetLastError()); "failed to GetProcessHeap (%lu)", osGetLastError());
return SQLITE_NOMEM; return SQLITE_NOMEM;
} }
pWinMemData->bOwned = FALSE; pWinMemData->bOwned = FALSE;
@@ -1309,7 +1309,7 @@ static void winMemShutdown(void *pAppData){
#endif #endif
if( pWinMemData->bOwned ){ if( pWinMemData->bOwned ){
if( !osHeapDestroy(pWinMemData->hHeap) ){ if( !osHeapDestroy(pWinMemData->hHeap) ){
sqlite3_log(SQLITE_NOMEM, "failed to HeapDestroy (%d), heap=%p", sqlite3_log(SQLITE_NOMEM, "failed to HeapDestroy (%lu), heap=%p",
osGetLastError(), (void*)pWinMemData->hHeap); osGetLastError(), (void*)pWinMemData->hHeap);
} }
pWinMemData->bOwned = FALSE; pWinMemData->bOwned = FALSE;