From: shaneh <shaneh@noemail.net>
Date: Wed, 7 Jul 2010 16:49:46 +0000 (+0000)
Subject: Fix some MSVC compiler warnings in the ASYNC extension.
X-Git-Tag: version-3.7.2~167
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b638a3d3eb0df0db9566945b99e7496ed59f29ca;p=thirdparty%2Fsqlite.git

Fix some MSVC compiler warnings in the ASYNC extension.

FossilOrigin-Name: b951c8675df3e719c30a1dd94200b7c04252a3ea
---

diff --git a/ext/async/sqlite3async.c b/ext/async/sqlite3async.c
index 65399a57a8..0590230a53 100644
--- a/ext/async/sqlite3async.c
+++ b/ext/async/sqlite3async.c
@@ -690,7 +690,7 @@ static int asyncRead(
     }
     nRead = MIN(filesize - iOffset, iAmt64);
     if( nRead>0 ){
-      rc = pBase->pMethods->xRead(pBase, zOut, nRead, iOffset);
+      rc = pBase->pMethods->xRead(pBase, zOut, (int)nRead, iOffset);
       ASYNC_TRACE(("READ %s %d bytes at %d\n", p->zName, nRead, iOffset));
     }
   }
@@ -706,7 +706,6 @@ static int asyncRead(
       )){
         sqlite3_int64 nCopy;
         sqlite3_int64 nByte64 = (sqlite3_int64)pWrite->nByte;
-        filesize = MAX(filesize, pWrite->iOffset+nByte64);
 
         /* Set variable iBeginIn to the offset in buffer pWrite->zBuf[] from
         ** which data should be copied. Set iBeginOut to the offset within
@@ -718,9 +717,11 @@ static int asyncRead(
         if( iBeginIn<0 ) iBeginIn = 0;
         if( iBeginOut<0 ) iBeginOut = 0;
 
+        filesize = MAX(filesize, pWrite->iOffset+nByte64);
+
         nCopy = MIN(nByte64-iBeginIn, iAmt64-iBeginOut);
         if( nCopy>0 ){
-          memcpy(&((char *)zOut)[iBeginOut], &pWrite->zBuf[iBeginIn], nCopy);
+          memcpy(&((char *)zOut)[iBeginOut], &pWrite->zBuf[iBeginIn], (size_t)nCopy);
           ASYNC_TRACE(("OVERREAD %d bytes at %d\n", nCopy, iBeginOut+iOffset));
         }
       }
@@ -1236,7 +1237,7 @@ static int asyncFullPathname(
   if( rc==SQLITE_OK ){
     int i, j;
     char *z = zPathOut;
-    int n = strlen(z);
+    int n = (int)strlen(z);
     while( n>1 && z[n-1]=='/' ){ n--; }
     for(i=j=0; i<n; i++){
       if( z[i]=='/' ){
diff --git a/manifest b/manifest
index 65dbe34b7a..f70113ab94 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\stogether\sanother\saccidental\sfork.
-D 2010-07-07T16:23:37
+C Fix\ssome\sMSVC\scompiler\swarnings\sin\sthe\sASYNC\sextension.
+D 2010-07-07T16:49:46
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c4270a1cd7cd70a263b7e96a258aa90e9c3618eb
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -29,7 +29,7 @@ F doc/pager-invariants.txt 870107036470d7c419e93768676fae2f8749cf9e
 F doc/vfs-shm.txt e101f27ea02a8387ce46a05be2b1a902a021d37a
 F ext/README.txt 913a7bd3f4837ab14d7e063304181787658b14e1
 F ext/async/README.txt 0c541f418b14b415212264cbaaf51c924ec62e5b
-F ext/async/sqlite3async.c ee69bf38c0ee9dca42708291e158bdbce31076cb
+F ext/async/sqlite3async.c d0f7e07c6a9757e45bb9b3e38211195c790a9d9d
 F ext/async/sqlite3async.h a21e1252deb14a2c211f0e165c4b9122a8f1f344
 F ext/fts1/README.txt 20ac73b006a70bcfd80069bdaf59214b6cf1db5e
 F ext/fts1/ft_hash.c 3927bd880e65329bdc6f506555b228b28924921b
@@ -831,7 +831,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P e92de834a39be07da5f0848d7ec5f1f6dff902a5 5bb1330fef559d47dc854089dedba45bf05db192
-R 2cb3265b9192594b862fd2ad29948911
-U dan
-Z 8482fc13a7988de5df49ec0e46a26968
+P c41f04edb20c0c8fc8c49a53d42cc0b8a0ff7fe3
+R 9b2126a4d9ad3dbdc4271d526f5c179a
+U shaneh
+Z 7cb7549bc8684ba00d1de05338b5a361
diff --git a/manifest.uuid b/manifest.uuid
index 6beb271b25..444af49aa8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c41f04edb20c0c8fc8c49a53d42cc0b8a0ff7fe3
\ No newline at end of file
+b951c8675df3e719c30a1dd94200b7c04252a3ea
\ No newline at end of file