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

Rearrange a variable declaration in the proxy locking code to avoid a harmless

Browse Source 
compiler warning on recent MacOS versions.

FossilOrigin-Name: 39bbd35599e735b32f7ed18143073165b805dd98
This commit is contained in:
drh
2010-12-21 00:16:40 +00:00
parent 08bd9f83ce
commit 29ecd8a077
3 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
manifest
View File

@@ -1,8 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE----- C Rearrange\sa\svariable\sdeclaration\sin\sthe\sproxy\slocking\scode\sto\savoid\sa\sharmless\ncompiler\swarning\son\srecent\sMacOS\sversions.
Hash: SHA1 D 2010-12-21T00:16:40
C Clarify\sthe\sdocumentation\sof\sthe\sSQLITE_STATUS_MALLOC_COUNT\sparameter\sto\nsqlite3_status().
D 2010-12-20T17:00:28
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0 F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -163,7 +160,7 @@ F src/os.c 22ac61d06e72a0dac900400147333b07b13d8e1d
F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e
F src/os_unix.c 0240c5b547b4cf585c8cac351a95c3e85ce00772 F src/os_unix.c c43a55b46a6be81a4f29a52eb88245e5d7f342fa
F src/os_win.c 2f90f7bdec714fad51cd31b4ecad3cc1b4bb5aad F src/os_win.c 2f90f7bdec714fad51cd31b4ecad3cc1b4bb5aad
F src/pager.c c0aca5c733c15a16fe158c3215d857841a4e5381 F src/pager.c c0aca5c733c15a16fe158c3215d857841a4e5381
F src/pager.h 0ea59db2a33bc6c2c02cae34de33367e1effdf76 F src/pager.h 0ea59db2a33bc6c2c02cae34de33367e1effdf76
@@ -897,14 +894,7 @@ 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 74fff692345fed4b247e2b34c1e63b4d50cddfd4 P 3b41bcc3e36a9ef0146bc2f6ae86377bd1700afd
R 05696043bb691972743f116032eb7cc7 R 1a70a1f19194c16e9b9725927017bb71
U drh U drh
Z 0d94f4cb1ba5a4f17daf853cca6b2b1d Z 9866ee9011213cea3ec50de8e4d375c6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFND4uvoxKgR168RlERAmboAJ9ECncAj8L2uNPORTjmNgH2KLgLGQCfTHpL
w2fdORwbJsTAnpJEGct6W7Q=
=6J0C
-----END PGP SIGNATURE-----

2
manifest.uuid
View File

@@ -1 +1 @@
3b41bcc3e36a9ef0146bc2f6ae86377bd1700afd 39bbd35599e735b32f7ed18143073165b805dd98

15
src/os_unix.c
View File

@@ -5403,18 +5403,19 @@ extern int gethostuuid(uuid_t id, const struct timespec *wait);
** bytes of writable memory. ** bytes of writable memory.
*/ */
static int proxyGetHostID(unsigned char *pHostID, int *pError){ static int proxyGetHostID(unsigned char *pHostID, int *pError){
struct timespec timeout = {1, 0}; /* 1 sec timeout */
assert(PROXY_HOSTIDLEN == sizeof(uuid_t)); assert(PROXY_HOSTIDLEN == sizeof(uuid_t));
memset(pHostID, 0, PROXY_HOSTIDLEN); memset(pHostID, 0, PROXY_HOSTIDLEN);
#if defined(__MAX_OS_X_VERSION_MIN_REQUIRED)\ #if defined(__MAX_OS_X_VERSION_MIN_REQUIRED)\
&& __MAC_OS_X_VERSION_MIN_REQUIRED<1050 && __MAC_OS_X_VERSION_MIN_REQUIRED<1050
if( gethostuuid(pHostID, &timeout) ){ {
int err = errno; static const struct timespec timeout = {1, 0}; /* 1 sec timeout */
if( pError ){ if( gethostuuid(pHostID, &timeout) ){
*pError = err; int err = errno;
if( pError ){
*pError = err;
}
return SQLITE_IOERR;
} }
return SQLITE_IOERR;
} }
#endif #endif
#ifdef SQLITE_TEST #ifdef SQLITE_TEST