From: dan <dan@noemail.net>
Date: Fri, 30 Dec 2011 09:00:19 +0000 (+0000)
Subject: Change an implicit i64-to-int cast in pager.c to an explicit cast.
X-Git-Tag: mountain-lion~8^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e208252c92206760d2208603acf7d594f7489ce;p=thirdparty%2Fsqlite.git

Change an implicit i64-to-int cast in pager.c to an explicit cast.

FossilOrigin-Name: 6a71ba9ce930838d44ed8d399075ba0723c9132b
---

diff --git a/manifest b/manifest
index 392de553ec..47d18e93ef 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssome\stypos\sin\scomments.\sNo\scode\schanges.
-D 2011-12-30T05:08:41.951
+C Change\san\simplicit\si64-to-int\scast\sin\spager.c\sto\san\sexplicit\scast.
+D 2011-12-30T09:00:19.278
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -168,7 +168,7 @@ F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
 F src/os_unix.c 3a441671f35569df4b72641e928fdb1ab5cd8576
 F src/os_win.c 569fe7448e781bfb8116aa79081df0eadf576fc6
-F src/pager.c d03fb1de7bd724f0cdcae0aab0a733d89c94ac2f
+F src/pager.c 0ae6079dd6109d475e54ff2ce3131dd0a3fea24f
 F src/pager.h 5cd760857707529b403837d813d86b68938d6183
 F src/parse.y fabb2e7047417d840e6fdb3ef0988a86849a08ba
 F src/pcache.c 1fdd77978c1525d1ca4b9ef48eb80abca710cb4c
@@ -986,7 +986,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P a8a1a639fe441a533b11ada7368b2200edea7a05
-R 543342ae679dc2b9a76e5d06ebe795fb
+P 4edc5994b26e1fd3245572cb80242d07ba20a475
+R 1bc770471ba89216f7a16ad43b7ad6d5
 U dan
-Z cff3fff2b321de20b23137e8553f1cda
+Z 18d47a3b5d2edb28ffe71e9399d7b1d4
diff --git a/manifest.uuid b/manifest.uuid
index edfd491f47..1bde373959 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4edc5994b26e1fd3245572cb80242d07ba20a475
\ No newline at end of file
+6a71ba9ce930838d44ed8d399075ba0723c9132b
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index 892c245b44..e1a3385b05 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -4370,7 +4370,8 @@ int sqlite3PagerOpen(
       z += sqlite3Strlen30(z)+1;
       z += sqlite3Strlen30(z)+1;
     }
-    nUri = &z[1] - zUri;
+    nUri = (int)(&z[1] - zUri);
+    assert( nUri>=0 );
     if( rc==SQLITE_OK && nPathname+8>pVfs->mxPathname ){
       /* This branch is taken when the journal path required by
       ** the database being opened will be more than pVfs->mxPathname