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

Readability improvements for winRandomness.

Browse Source 
FossilOrigin-Name: 1640f814c7a5210f08c81e52e5a3fb89ac26f4d4
This commit is contained in:
mistachkin
2016-02-15 22:37:18 +00:00
parent 0ead47d1c7
commit b71aef3461
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Fix\scomment.\s\sNo\schanges\sto\scode. C Readability\simprovements\sfor\swinRandomness.
D 2016-02-15T22:28:50.979 D 2016-02-15T22:37:18.018
F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142 F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 30f075dc4f27a07abb76088946b2944178d85347 F Makefile.msc 30f075dc4f27a07abb76088946b2944178d85347
@@ -333,7 +333,7 @@ F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
F src/os_unix.c 3a6f20736dfb8a0949cdd66553fdf59f6604be35 F src/os_unix.c 3a6f20736dfb8a0949cdd66553fdf59f6604be35
F src/os_win.c 1a781c2362ce07bcb6b3cd4b0c51c833eff70189 F src/os_win.c f0d7aa603eb6262143d7169a222aea07c4fca91d
F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
F src/pager.c 6812f3803951774b56abded396171e1c12b0b003 F src/pager.c 6812f3803951774b56abded396171e1c12b0b003
F src/pager.h f3eb324a3ff2408b28bab7e81c1c55c13720f865 F src/pager.h f3eb324a3ff2408b28bab7e81c1c55c13720f865
@@ -1427,7 +1427,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh a98af506df552f3b3c0d904f94e4cdc4e1a6d598 F tool/warnings.sh a98af506df552f3b3c0d904f94e4cdc4e1a6d598
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 287f508dd6abc1b9ffdbec6a685ebe79eeac992b P 2e1f2eff27e25280fe626c07b6260b0a7aa903d3
R 9d5f50ad392123c1263322df3a641869 R dd8a80ac652728cd502c81c91874767f
U mistachkin U mistachkin
Z 47f9e57e8f4d3a40a70b451a66c69ad4 Z 8e4d3c615023f7e6ecbb584ba3188e53

2
manifest.uuid
View File

@@ -1 +1 @@
2e1f2eff27e25280fe626c07b6260b0a7aa903d3 1640f814c7a5210f08c81e52e5a3fb89ac26f4d4

18
src/os_win.c
View File

@@ -5410,7 +5410,7 @@ static void xorMemory(EntropyGatherer *p, unsigned char *x, int sz){
p->i = k; p->i = k;
p->nXor += sz; p->nXor += sz;
} }
#endif #endif /* !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS) */
/* /*
** Write up to nBuf bytes of randomness into zBuf. ** Write up to nBuf bytes of randomness into zBuf.
@@ -5426,7 +5426,7 @@ static int winRandomness(sqlite3_vfs *pVfs, int nBuf, char *zBuf){
memset(zBuf, 0, nBuf); memset(zBuf, 0, nBuf);
#if defined(_MSC_VER) && _MSC_VER>=1400 #if defined(_MSC_VER) && _MSC_VER>=1400
rand_s((int*)zBuf); /* rand_s() is not available with MinGW */ rand_s((int*)zBuf); /* rand_s() is not available with MinGW */
#endif #endif /* defined(_MSC_VER) && _MSC_VER>=1400 */
e.a = (unsigned char*)zBuf; e.a = (unsigned char*)zBuf;
e.na = nBuf; e.na = nBuf;
e.nXor = 0; e.nXor = 0;
@@ -5434,27 +5434,27 @@ static int winRandomness(sqlite3_vfs *pVfs, int nBuf, char *zBuf){
{ {
SYSTEMTIME x; SYSTEMTIME x;
osGetSystemTime(&x); osGetSystemTime(&x);
xorMemory(&e, (unsigned char*)&x, sizeof(x)); xorMemory(&e, (unsigned char*)&x, sizeof(SYSTEMTIME));
} }
{ {
DWORD pid = osGetCurrentProcessId(); DWORD pid = osGetCurrentProcessId();
xorMemory(&e, (unsigned char*)&pid, sizeof(pid)); xorMemory(&e, (unsigned char*)&pid, sizeof(DWORD));
} }
#if SQLITE_OS_WINRT #if SQLITE_OS_WINRT
{ {
ULONGLONG cnt = osGetTickCount64(); ULONGLONG cnt = osGetTickCount64();
xorMemory(&e, (unsigned char*)&cnt, sizeof(cnt)); xorMemory(&e, (unsigned char*)&cnt, sizeof(ULONGLONG));
} }
#else #else
{ {
DWORD cnt = osGetTickCount(); DWORD cnt = osGetTickCount();
xorMemory(&e, (unsigned char*)&cnt, sizeof(cnt)); xorMemory(&e, (unsigned char*)&cnt, sizeof(DWORD));
} }
#endif #endif /* SQLITE_OS_WINRT */
{ {
LARGE_INTEGER i; LARGE_INTEGER i;
osQueryPerformanceCounter(&i); osQueryPerformanceCounter(&i);
xorMemory(&e, (unsigned char*)&i, sizeof(i)); xorMemory(&e, (unsigned char*)&i, sizeof(LARGE_INTEGER));
} }
#if !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && SQLITE_WIN32_USE_UUID #if !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && SQLITE_WIN32_USE_UUID
{ {
@@ -5466,7 +5466,7 @@ static int winRandomness(sqlite3_vfs *pVfs, int nBuf, char *zBuf){
osUuidCreateSequential(&id); osUuidCreateSequential(&id);
xorMemory(&e, (unsigned char*)&id, sizeof(UUID)); xorMemory(&e, (unsigned char*)&id, sizeof(UUID));
} }
#endif #endif /* !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && SQLITE_WIN32_USE_UUID */
return e.nXor>nBuf ? nBuf : e.nXor; return e.nXor>nBuf ? nBuf : e.nXor;
#endif /* defined(SQLITE_TEST) || defined(SQLITE_OMIT_RANDOMNESS) */ #endif /* defined(SQLITE_TEST) || defined(SQLITE_OMIT_RANDOMNESS) */
} }