From: mlcreech <mlcreech@noemail.net>
Date: Sat, 29 Mar 2008 23:25:27 +0000 (+0000)
Subject: Minor cleanup: Use size_t for struct size cast (CVS 4940)
X-Git-Tag: version-3.5.8~79
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe3f4e8a4abdb12b0dc66d4c6a6254779297f8d1;p=thirdparty%2Fsqlite.git

Minor cleanup: Use size_t for struct size cast (CVS 4940)

FossilOrigin-Name: 618df68b8b78d376d30cea79a273fd39140f5033
---

diff --git a/manifest b/manifest
index 0848b81560..cb52e3584e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Set\sexclusive\slocking\smode\sby\sdefault\son\sthe\sspeed4p\stest.\s(CVS\s4939)
-D 2008-03-29T17:26:02
+C Minor\scleanup:\sUse\ssize_t\sfor\sstruct\ssize\scast\s(CVS\s4940)
+D 2008-03-29T23:25:27
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in cf434ce8ca902e69126ae0f94fc9f7dc7428a5fa
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -181,7 +181,7 @@ F src/vdbeapi.c ab6e99f8a6b7fcb82c2c698da7a36762a7593f0a
 F src/vdbeaux.c 519ec819a8e549d087899f0c9a912afcdda762b4
 F src/vdbeblob.c cc713c142c3d4952b380c98ee035f850830ddbdb
 F src/vdbefifo.c a30c237b2a3577e1415fb6e288cbb6b8ed1e5736
-F src/vdbemem.c e7ced8846ef50502cc610ecc7b32bb0f0bba1578
+F src/vdbemem.c b96fea7b98cc662ad7b587f28560b0c5649ac39f
 F src/vtab.c 00cd16317b29495c185ff40e4b227917d5a371b2
 F src/where.c dc146152cd0eb3b3568e92e7fed55cd008ebb9b5
 F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617
@@ -619,7 +619,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 9b567ab61e7542141b7bc9c3c053c2d1180da92d
-R b375f831a556a14b3cedf2f939dab204
-U drh
-Z 1931c28b60471617d06c6e5842f4d51d
+P 2d9fea95335ab8f399868f63c51bee89ed7633fa
+R d3d2e40b36f2816c97d23232dd10b170
+U mlcreech
+Z 6f382d3423b61a9e7296357f5beb1835
diff --git a/manifest.uuid b/manifest.uuid
index f0d2e01d93..11bd6b0a91 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2d9fea95335ab8f399868f63c51bee89ed7633fa
\ No newline at end of file
+618df68b8b78d376d30cea79a273fd39140f5033
\ No newline at end of file
diff --git a/src/vdbemem.c b/src/vdbemem.c
index ea24807ebf..8c1ad4796c 100644
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -508,7 +508,7 @@ int sqlite3VdbeMemTooBig(Mem *p){
 /*
 ** Size of struct Mem not including the Mem.zMalloc member.
 */
-#define MEMCELLSIZE (int)(&(((Mem *)0)->zMalloc))
+#define MEMCELLSIZE (size_t)(&(((Mem *)0)->zMalloc))
 
 /*
 ** Make an shallow copy of pFrom into pTo.  Prior contents of