Fix several harmless compiler warnings.

FossilOrigin-Name: 360c0fd1cf9db5f1e4f670a4b95971daaeaa5879

diff --git a/manifest b/manifest
index ec6377555e933a31fa3772b140477cfd044a93d8..d8d03a42edcc0a591b2206b0774ac7f082fe200e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stypos\sin\slogging\scode.
-D 2014-05-08T22:15:13.894
+C Fix\sseveral\sharmless\scompiler\swarnings.
+D 2014-05-09T00:36:06.204
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ad0921c4b2780d01868cf69b419a4f102308d125
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -205,7 +205,7 @@ F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
 F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c ae4b5240af4619d711301d7992396e182585269f
-F src/os_win.c b9c5bcee7c68117f57e6f9f231614796f784752a
+F src/os_win.c 5024065c68c50739aeef6d490db88e5b682fcc30
 F src/pager.c ab62a24218d87dda1be641f6c5ad291bff78fd94
 F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
 F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
@@ -1171,7 +1171,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 37e60d211f70d12eda6d8b63da5e5e307e9d1748
-R 003cca4a0717d2339a3508a0f730ef08
+P dc7f84dfcc8415fad4af041fd30c20b3fd91be45
+R dab57784c4183d6467c4fe813ebf5ee5
 U mistachkin
-Z 72fe979f39d255b6bde769412d2399a9
+Z bd4d9a5acb160a48faa7ad2a8521ce0e

diff --git a/manifest.uuid b/manifest.uuid
index 62156cd62870f2909b8ee9c7a3ce743dd229ce0e..dabcd6e747210434a8f759f61343a96eea65356f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dc7f84dfcc8415fad4af041fd30c20b3fd91be45
\ No newline at end of file
+360c0fd1cf9db5f1e4f670a4b95971daaeaa5879
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index d1229a0ce865acf0fa31060c276710377cfafb07..b9ac6a9387edc0055058c09d04575f992f3de56e 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -3230,8 +3230,8 @@ static void *winPreCacheThread(void *pCtx){
                          &dupHandle, 0, FALSE, DUPLICATE_SAME_ACCESS) ){
     pFile->lastErrno = osGetLastError();
     OSTRACE(("PRE-CACHE file=%p, rc=SQLITE_IOERR\n", dupHandle));
-    return winLogError(SQLITE_IOERR, pFile->lastErrno,
-                       "winPreCacheThread1", pFile->zPath);
+    return SQLITE_INT_TO_PTR(winLogError(SQLITE_IOERR, pFile->lastErrno,
+                                         "winPreCacheThread1", pFile->zPath));
   }
   dwSize = osSetFilePointer(dupHandle, 0, 0, FILE_END);
   if( (dwSize==INVALID_SET_FILE_POINTER
@@ -3239,8 +3239,8 @@ static void *winPreCacheThread(void *pCtx){
     pFile->lastErrno = lastErrno;
     osCloseHandle(dupHandle);
     OSTRACE(("PRE-CACHE file=%p, rc=SQLITE_IOERR_SEEK\n", dupHandle));
-    return winLogError(SQLITE_IOERR_SEEK, pFile->lastErrno,
-                       "winPreCacheThread2", pFile->zPath);
+    return SQLITE_INT_TO_PTR(winLogError(SQLITE_IOERR_SEEK, pFile->lastErrno,
+                                         "winPreCacheThread2", pFile->zPath));
   }
   dwRet = osSetFilePointer(dupHandle, 0, 0, FILE_BEGIN);
   if( (dwRet==INVALID_SET_FILE_POINTER
@@ -3248,8 +3248,8 @@ static void *winPreCacheThread(void *pCtx){
     pFile->lastErrno = lastErrno;
     osCloseHandle(dupHandle);
     OSTRACE(("PRE-CACHE file=%p, rc=SQLITE_IOERR_SEEK\n", dupHandle));
-    return winLogError(SQLITE_IOERR_SEEK, pFile->lastErrno,
-                       "winPreCacheThread3", pFile->zPath);
+    return SQLITE_INT_TO_PTR(winLogError(SQLITE_IOERR_SEEK, pFile->lastErrno,
+                                         "winPreCacheThread3", pFile->zPath));
   }
   dwAmt = 4194304; /* TODO: Tuning. */
   if( dwSize<dwAmt ){
@@ -3259,7 +3259,7 @@ static void *winPreCacheThread(void *pCtx){
   if( pBuf==0 ){
     osCloseHandle(dupHandle);
     OSTRACE(("PRE-CACHE file=%p, rc=SQLITE_IOERR_NOMEM\n", dupHandle));
-    return SQLITE_IOERR_NOMEM;
+    return SQLITE_INT_TO_PTR(SQLITE_IOERR_NOMEM);
   }
   while( 1 ){
     if( !osReadFile(dupHandle, pBuf, dwAmt, &nRead, 0) ){
@@ -3267,15 +3267,16 @@ static void *winPreCacheThread(void *pCtx){
       sqlite3_free(pBuf);
       osCloseHandle(dupHandle);
       OSTRACE(("PRE-CACHE file=%p, rc=SQLITE_IOERR_READ\n", dupHandle));
-      return winLogError(SQLITE_IOERR_READ, pFile->lastErrno,
-                         "winPreCacheThread4", pFile->zPath);
+      return SQLITE_INT_TO_PTR(winLogError(SQLITE_IOERR_READ, pFile->lastErrno,
+                                           "winPreCacheThread4", pFile->zPath));
     }
     if( nRead<dwAmt ){
       sqlite3_free(pBuf);
       osCloseHandle(dupHandle);
       OSTRACE(("PRE-CACHE file=%p, rc=SQLITE_IOERR_SHORT_READ\n", dupHandle));
-      return winLogError(SQLITE_IOERR_SHORT_READ, pFile->lastErrno,
-                         "winPreCacheThread5", pFile->zPath);
+      return SQLITE_INT_TO_PTR(winLogError(SQLITE_IOERR_SHORT_READ,
+                                           pFile->lastErrno,
+                                           "winPreCacheThread5", pFile->zPath));
     }
     dwSize -= dwAmt;
     if( dwSize==0 ){
@@ -3284,7 +3285,7 @@ static void *winPreCacheThread(void *pCtx){
   }
   sqlite3_free(pBuf);
   osCloseHandle(dupHandle);
-  return SQLITE_OK;
+  return SQLITE_INT_TO_PTR(SQLITE_OK);
 }
 #endif