Fix several small style/consistency issues with the previous check-in.

FossilOrigin-Name: 2477b3a294beb35f806a38f3ebc008942ba01617

diff --git a/Makefile.msc b/Makefile.msc
index 119468a92d28beaabaa4ece36851a8793c432c4b..5d6460b7d573599cd9d4591bbfbb8727afe52d35 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1321,7 +1321,6 @@ testfixture.exe:  $(TESTFIXTURE_SRC) $(LIBRESOBJS) $(HDR)
 
 extensiontest: testfixture.exe testloadext.dll
        .\testfixture.exe $(TOP)\test\loadext.test
-       .\testfixture.exe $(TOP)\test\loadext2.test
 
 fulltest:      testfixture.exe sqlite3.exe
        .\testfixture.exe $(TOP)\test\all.test
@@ -1373,6 +1372,7 @@ clean:
        del /Q sqlite3.h opcodes.c opcodes.h
        del /Q lemon.exe lempar.c parse.*
        del /Q mkkeywordhash.exe keywordhash.h
+       del /Q notasharedlib.*
        -rmdir /Q/S .deps
        -rmdir /Q/S .libs
        -rmdir /Q/S quota2a

diff --git a/manifest b/manifest
index 7b0e38f502f69e698066075d5dae5f67fdd17ae2..ee235b0695bac8951afe4e7e7bb2539a3c119558 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Enhance\stesting\ssupport\sfor\sthe\sWin32\sVFS\sdynamic\sextension\sloading\sfacilities.
-D 2014-02-24T21:20:25.412
+C Fix\sseveral\ssmall\sstyle/consistency\sissues\swith\sthe\sprevious\scheck-in.
+D 2014-02-24T21:42:33.898
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 4b39e17eb244d2fd3fb825d896380b38b782e69a
+F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19
 F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
 F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
 F VERSION 0dc30ad5cf90736d5fd9e540c9f05c542658abe7
@@ -203,7 +203,7 @@ F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
 F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c 18f7f95dc6bcb9cf4d4a238d8e2de96611bc2ae5
-F src/os_win.c 166d2f195ea0b7b4ea948229f727f0a293dd3c65
+F src/os_win.c c47f107fc5c9d3466c06ea4aa35822f3568e81ee
 F src/pager.c 0ffa313a30ed6d061d9c6601b7b175cc50a1cab7
 F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
 F src/parse.y 2613ca5d609c2f3d71dd297351f010bcec16e1e0
@@ -1151,7 +1151,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P d6746cabaa22429644c956a4b5fd91896376de2d
-R 92acab9fb5e448fe2bef6b9a7d9bb046
+P 53081e7202fb55f792a78e73627466eb0200f11c
+R eaeb88d7c9d1a25aae3665432185c5f6
 U mistachkin
-Z 2600b243b92aaa5b75c087148e5db2b4
+Z 8d06aaa0b8bcae8ffbf3fa0332e7604d

diff --git a/manifest.uuid b/manifest.uuid
index 8331b56d7526f99a0d5fe8513dfc8ec401760350..9798e1319d2f8c757541ac71c45c435cf0665ae3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-53081e7202fb55f792a78e73627466eb0200f11c
\ No newline at end of file
+2477b3a294beb35f806a38f3ebc008942ba01617
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index ac5eb886e3cdac733925aff31238f2a326cbab1d..55ade5c7e2641f52d7c40e8805ab5a46b16a2729 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -5164,12 +5164,12 @@ static void winDlError(sqlite3_vfs *pVfs, int nBuf, char *zBufOut){
   winGetLastErrorMsg(osGetLastError(), nBuf, zBufOut);
 }
 static void (*winDlSym(sqlite3_vfs *pVfs,void *pH,const char *zSym))(void){
-  FARPROC pProc;
+  FARPROC proc;
   UNUSED_PARAMETER(pVfs);
-  pProc = osGetProcAddressA((HANDLE)pH, zSym);
-  OSTRACE(("DLSYM handle=%p, symbol=%s, proc=%p\n",
-           (void*)pH, zSym, (void*)pProc));
-  return (void(*)(void))pProc;
+  proc = osGetProcAddressA((HANDLE)pH, zSym);
+  OSTRACE(("DLSYM handle=%p, symbol=%s, address=%p\n",
+           (void*)pH, zSym, (void*)proc));
+  return (void(*)(void))proc;
 }
 static void winDlClose(sqlite3_vfs *pVfs, void *pHandle){
   UNUSED_PARAMETER(pVfs);