Fix harmless compiler warnings in sqldiff.c.

FossilOrigin-Name: 74808a79ea3194f6cc00084b9dccc380846a6051

diff --git a/manifest b/manifest
index d9cc1407509f37eea35d051d1a9c756f8ad5fb6e..7187aa4558148dc2d418abebbbeffc0e41bb957d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sbuild\sso\sthat\sit\sworks\sfor\sSQLITE_OMIT_WAL\sagain.
-D 2016-01-14T01:56:43.015
+C Fix\sharmless\scompiler\swarnings\sin\ssqldiff.c.
+D 2016-01-14T12:23:16.611
 F Makefile.in 7c8cc4c2f0179efc6fa9492141d1fb65f4807054
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e45d8b9b56dfa3f2cd860b2c28bd9d304513b042
@@ -1401,7 +1401,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 7ce07da76b5e745783e703a834417d725b7d45fd
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
-F tool/sqldiff.c 653db1a9294e0b34849c4504599c282a18d8b8c6
+F tool/sqldiff.c 5a26205111e6fa856d9b1535b1637744dcdb930b
 F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43
 F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
 F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
@@ -1412,7 +1412,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 9c3a0dc2e8bf202cd846841bd5d4ea67aa189c1a
-R 7d3ddebf3af55be615ba3903145bc66f
+P d55a557bc70460c46a67ae5acd9f8a8356a580c2
+R 34645f4f80a93ccb4b9986535bb6f0b0
 U drh
-Z 40f341244fdfbe64f691992440e887ec
+Z 0c8aaf707fea483adf01b6983fc067a8

diff --git a/manifest.uuid b/manifest.uuid
index 6e8776e5e5b76e0df97200f50574c55624f580c0..4d3f464471103ebb40f694dbcbd8a6e36e7c205d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d55a557bc70460c46a67ae5acd9f8a8356a580c2
\ No newline at end of file
+74808a79ea3194f6cc00084b9dccc380846a6051
\ No newline at end of file

diff --git a/tool/sqldiff.c b/tool/sqldiff.c
index 56ff53ee25766d6e4941c60a1f85c5a73a89c73a..ae01cd3c4deae9e361c46d61e9c1127048abe7db 100644 (file)
--- a/tool/sqldiff.c
+++ b/tool/sqldiff.c
@@ -994,7 +994,7 @@ static int rbuDeltaCreate(
     zDelta += lenOut;
     putInt(checksum(zOut, lenOut), &zDelta);
     *(zDelta++) = ';';
-    return zDelta - zOrigDelta;
+    return (int)(zDelta - zOrigDelta);
   }
 
   /* Compute the hash table used to locate matching sections in the
@@ -1141,7 +1141,7 @@ static int rbuDeltaCreate(
   putInt(checksum(zOut, lenOut), &zDelta);
   *(zDelta++) = ';';
   sqlite3_free(collide);
-  return zDelta - zOrigDelta;
+  return (int)(zDelta - zOrigDelta);
 }
 
 /*