Add casts to shell.c.in to avoid warnings on systems where size_t is 32 bits.

FossilOrigin-Name: fe014288ac03cdf0dc5410b7d45cad4768759b52746c0a22bce2fc03779c5d5a

diff --git a/manifest b/manifest
index 04b7868ed48d67ad0737b197719fa50e27fd77c1..a8092147c61d38505b96afb536a9869fb7a63a5a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\snew\sassert()\sstatements\sin\san\sattempt\sto\shelp\sstatic\sanalyzers\savoid\nfalse-positives.
-D 2019-07-16T19:44:32.038
+C Add\scasts\sto\sshell.c.in\sto\savoid\swarnings\son\ssystems\swhere\ssize_t\sis\s32\sbits.
+D 2019-07-17T07:23:06.341
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -523,7 +523,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 17d61645b0782809aa2cc68225e93c3ed6a55ca59edcdbf599b5b4a828cec9fb
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c c4b4fe44df6bcf32b693267ae9ec68e1c25f9a29d4a17afebd287d4af2f5fb51
-F src/shell.c.in 5c0171b66ee0aa4be9d5ca112f1ef50aec33dd48e8cbcb36779b9ddba068854a
+F src/shell.c.in 360607dce532811befb43946e10697833cadac8f8924aaeab56014c9e93c68a7
 F src/sqlite.h.in 83ebc8ab1a2e82d92214006ea2c15bf8a0604f3fac2c31dd9ce9021f568c71f2
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 9ecc93b8493bd20c0c07d52e2ac0ed8bab9b549c7f7955b59869597b650dd8b5
@@ -1835,7 +1835,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 22a7c15b262376fb0ce4dd3d044373380d86c5ccd96e2f24576cf04318597c33
-R af7ed786fd26f08c6e74a9cdd64afe47
-U drh
-Z 0311542e0816de566884848aca80984c
+P 9e66458592d40fbd96ea5f21339573110ca1cfe328238a020c9420a87d35dd72
+R e10a56ffab89aeb6c132764d41933ce5
+U dan
+Z 0a446b49c5cd11f0249e04708e61ac08

diff --git a/manifest.uuid b/manifest.uuid
index 274ba1afead58ffb17dacf5968491556239b8139..3b782b72f671290723e1be8fe2240e8f6fd281b7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9e66458592d40fbd96ea5f21339573110ca1cfe328238a020c9420a87d35dd72
\ No newline at end of file
+fe014288ac03cdf0dc5410b7d45cad4768759b52746c0a22bce2fc03779c5d5a
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 28022204c634e6bffd38cb793757cf8ed2e39550..c63e9bcd685d66424d224ded2c82b8f8039b6633 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1256,12 +1256,12 @@ static void editFunc(
   }
   sz = sqlite3_value_bytes(argv[0]);
   if( bBin ){
-    x = fwrite(sqlite3_value_blob(argv[0]), 1, sz, f);
+    x = fwrite(sqlite3_value_blob(argv[0]), 1, (size_t)sz, f);
   }else{
     const char *z = (const char*)sqlite3_value_text(argv[0]);
     /* Remember whether or not the value originally contained \r\n */
     if( z && strstr(z,"\r\n")!=0 ) hasCRNL = 1;
-    x = fwrite(sqlite3_value_text(argv[0]), 1, sz, f);
+    x = fwrite(sqlite3_value_text(argv[0]), 1, (size_t)sz, f);
   }
   fclose(f);
   f = 0;
@@ -1294,7 +1294,7 @@ static void editFunc(
     sqlite3_result_error_nomem(context);
     goto edit_func_end;
   }
-  x = fread(p, 1, sz, f);
+  x = fread(p, 1, (size_t)sz, f);
   fclose(f);
   f = 0;
   if( x!=sz ){