Remove unused sqlite3VdbeMemDynamicify() function from the VDBE. (CVS 5500)

FossilOrigin-Name: aee63308312bcebb79e15cfdf942ee23694444b0

diff --git a/manifest b/manifest
index fa9707b89b8f9c1ef0657352aad52103ceac5c1b..59b7e637477cb653d93c124bec6c1a504c8655e2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Backport\shttp://www.sqlite.org/cvstrac/chngview?cn=5489\sfrom\sfts3.\nRe-used\sprepared\sstatement\sfrom\sfts2\scursor.\s(CVS\s5499)
-D 2008-07-29T20:38:18
+C Remove\sunused\ssqlite3VdbeMemDynamicify()\sfunction\sfrom\sthe\sVDBE.\s(CVS\s5500)
+D 2008-07-30T13:14:55
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in bbb62eecc851379aef5a48a1bf8787eb13e6ec06
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -183,14 +183,14 @@ F src/update.c 79b77a3cc8ed5f8903a7f37055fcedd69388dcae
 F src/utf.c a7004436a6ef2aee012ace93de274dd0f3c7624e
 F src/util.c afe659ccc05d1f8af9e8631dabfec3ee3a7144af
 F src/vacuum.c ef342828002debc97514617af3424aea8ef8522c
-F src/vdbe.c 78171c3fbaff3f8880012ef5eda9f862fdca936c
+F src/vdbe.c 4a5b78debc983d26954d1283f92810d161a7292a
 F src/vdbe.h c46155c221418bea29ee3a749d5950fcf85a70e2
-F src/vdbeInt.h 1672cc137eb1d693090a17ded6682927fc851ca9
+F src/vdbeInt.h ab27f964458fd070c6660f80694ab85d56d5f4c5
 F src/vdbeapi.c 25dd01c8b12978c14ec30e9a50666b23da767b27
 F src/vdbeaux.c 706d722088350fe18bc9c41250b4f19509f00390
 F src/vdbeblob.c f93110888ddc246215e9ba1f831d3d375bfd8355
 F src/vdbefifo.c 20fda2a7c4c0bcee1b90eb7e545fefcdbf2e1de7
-F src/vdbemem.c 7ab2a77d7f07ae74d678b6754488bcd50c4ea3aa
+F src/vdbemem.c bdf92746583b0187655d736c4a20a2622eb9ab69
 F src/vtab.c 691813795f1bba5df57389c1cec62f9e73eebd9d
 F src/where.c ee4878e42ac97e2b3389b44cee34b35458321488
 F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617
@@ -614,7 +614,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P ae96d960e6e31315d25c7e5c3fb8363ed1b35350
-R c8b28180ba8665612880184e0c20b27c
-U shess
-Z 55f351b9e5be2316c863f86a07e2dcf1
+P 02870ed21dae2601a656b2f30c3ca0041e9cb60f
+R 9c89ba082a6d33efced66c7d58c4de39
+U drh
+Z 425dec81d319b292477b88c9ab7da758

diff --git a/manifest.uuid b/manifest.uuid
index 960db5dce0890b720a978b9826845ae6de3693ba..8ce8fabc3ff4cca40d03f8b25dfd7121f3c08b35 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-02870ed21dae2601a656b2f30c3ca0041e9cb60f
\ No newline at end of file
+aee63308312bcebb79e15cfdf942ee23694444b0
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 3ba3e1daac0746017229db666530f08bd7c2874d..db8e4f0c3c9ba3e941d0f95e7e2e1f7c7d72a7df 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.767 2008/07/29 10:18:57 danielk1977 Exp $
+** $Id: vdbe.c,v 1.768 2008/07/30 13:14:55 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -890,7 +890,7 @@ case OP_String8: {         /* same as TK_STRING, out2-prerelease */
   if( encoding!=SQLITE_UTF8 ){
     sqlite3VdbeMemSetStr(pOut, pOp->p4.z, -1, SQLITE_UTF8, SQLITE_STATIC);
     if( SQLITE_OK!=sqlite3VdbeChangeEncoding(pOut, encoding) ) goto no_mem;
-    if( SQLITE_OK!=sqlite3VdbeMemDynamicify(pOut) ) goto no_mem;
+    if( SQLITE_OK!=sqlite3VdbeMemMakeWriteable(pOut) ) goto no_mem;
     pOut->zMalloc = 0;
     pOut->flags |= MEM_Static;
     pOut->flags &= ~MEM_Dyn;

diff --git a/src/vdbeInt.h b/src/vdbeInt.h
index 6ce400e926ed39c7b6986ccca16b2eb1c4611977..7d36c61abec645da8602fb722b3e1167a857c22d 100644 (file)
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@ -15,7 +15,7 @@
 ** 6000 lines long) it was split up into several smaller files and
 ** this header information was factored out.
 **
-** $Id: vdbeInt.h,v 1.151 2008/07/28 19:34:54 drh Exp $
+** $Id: vdbeInt.h,v 1.152 2008/07/30 13:14:55 drh Exp $
 */
 #ifndef _VDBEINT_H_
 #define _VDBEINT_H_
@@ -407,7 +407,6 @@ void sqlite3VdbeMemSetDouble(Mem*, double);
 void sqlite3VdbeMemSetNull(Mem*);
 void sqlite3VdbeMemSetZeroBlob(Mem*,int);
 int sqlite3VdbeMemMakeWriteable(Mem*);
-int sqlite3VdbeMemDynamicify(Mem*);
 int sqlite3VdbeMemStringify(Mem*, int);
 i64 sqlite3VdbeIntValue(Mem*);
 int sqlite3VdbeMemIntegerify(Mem*);

diff --git a/src/vdbemem.c b/src/vdbemem.c
index 184195c3ba98d695921ece6b3dae8ff0280fa2b7..be6424c027d686a1b27e6d72fc8941777832aa9a 100644 (file)
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -15,7 +15,7 @@
 ** only within the VDBE.  Interface routines refer to a Mem using the
 ** name sqlite_value
 **
-** $Id: vdbemem.c,v 1.119 2008/07/28 19:34:54 drh Exp $
+** $Id: vdbemem.c,v 1.120 2008/07/30 13:14:55 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -110,11 +110,14 @@ int sqlite3VdbeMemGrow(Mem *pMem, int n, int preserve){
 }
 
 /*
-** Make the given Mem object MEM_Dyn.
+** Make the given Mem object MEM_Dyn.  In other words, make it so
+** that any TEXT or BLOB content is stored in memory obtained from
+** malloc().  In this way, we know that the memory is safe to be
+** overwritten or altered.
 **
 ** Return SQLITE_OK on success or SQLITE_NOMEM if malloc fails.
 */
-int sqlite3VdbeMemDynamicify(Mem *pMem){
+int sqlite3VdbeMemMakeWriteable(Mem *pMem){
   int f;
   assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
   expandBlob(pMem);
@@ -160,16 +163,6 @@ int sqlite3VdbeMemExpandBlob(Mem *pMem){
 #endif
 
 
-/*
-** Make the given Mem object either MEM_Short or MEM_Dyn so that bytes
-** of the Mem.z[] array can be modified.
-**
-** Return SQLITE_OK on success or SQLITE_NOMEM if malloc fails.
-*/
-int sqlite3VdbeMemMakeWriteable(Mem *pMem){
-  return sqlite3VdbeMemDynamicify(pMem);
-}
-
 /*
 ** Make sure the given Mem is \u0000 terminated.
 */