Modified core to not call deprecated functions sqlite3_memory_alarm() and sqlite3_tra...

FossilOrigin-Name: 821c387d159fd86cedb56c1130f0416bf5c65e6c

diff --git a/manifest b/manifest
index 8fdc301251c216afe8f4cd0e72a4e196ef5e177b..ac7b37d26dc87e0bc13a6092aa1975989ab39b72 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Work\saround\san\sissue\swith\sthe\sWINSCW\scompiler.\s(CVS\s5671)
-D 2008-09-03T17:11:16
+C Modified\score\sto\snot\scall\sdeprecated\sfunctions\ssqlite3_memory_alarm()\sand\ssqlite3_transfer_bindings()\sby\sadding\ssqlite3MemoryAlarm()\sand\ssqlite3TransferBindings().\s\ssqlite3_memory_alarm()\sand\ssqlite3_transfer_bindings()\sare\snow\ssimple\swrappers\sfor\sthe\snew\sfunctions.\s\sIn\sprep\sfor\sadding\sSQLITE_OMIT_DEPRECATED.\s(CVS\s5672)
+D 2008-09-04T04:32:49
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 689e14735f862a5553bceef206d8c13e29504e44
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -117,7 +117,7 @@ F src/journal.c cffd2cd214e58c0e99c3ff632b3bee6c7cbb260e
 F src/legacy.c aac57bd984e666059011ea01ec4383892a253be3
 F src/loadext.c 6581a5bbc4d74fcd46dbbcfd695a6a5417f778a2
 F src/main.c 088b513b16b480e96cbabab883107e0e74646a2e
-F src/malloc.c 9aa2ef805287017ed16a9e3809d275b8af26b762
+F src/malloc.c 6c3bcae8ee8885f1705f36306062f82a64d96118
 F src/mem1.c 5a529ff121c55ab067be14de00f86f6dcc4f4fb9
 F src/mem2.c f87e681d0d1ed8436870d089332ed0d27d885b5c
 F src/mem3.c 1594f117fde4cf11a6c16521f3f30af8d04bbe68
@@ -141,7 +141,7 @@ F src/parse.y d0f76d2cb8d6883d5600dc20beb961a6022b94b8
 F src/pcache.c ff79cb5eb797d0f1a244b4332c2d39cb5cfd066b
 F src/pcache.h 53730c33310cdf7a5c94e8333c853d59a3b30226
 F src/pragma.c 9d00ed41b261968757c02707e1508a707f2d46a7
-F src/prepare.c c197041e0c4770672cda75e6bfe10242f885e510
+F src/prepare.c bb0c76b7d149debe0fbc96b0b9b211180769a66f
 F src/printf.c 785f87120589c1db672e37c6eb1087c456e6f84d
 F src/random.c 11bbdf7def3746a762fbdb56c9d04648135ad6d8
 F src/resolve.c a6abf83125bce0c80ba04acc27c3565155ad305c
@@ -149,7 +149,7 @@ F src/select.c eec7c5f28a0c75fdd8500630435af176bba73219
 F src/shell.c d83b578a8ccdd3e0e7fef4388a0887ce9f810967
 F src/sqlite.h.in 7da6a0d39221affca458b4ba305be3eb1590bb8e
 F src/sqlite3ext.h 1e3887c9bd3ae66cb599e922824b04cd0d0f2c3e
-F src/sqliteInt.h 4e81ab61bc9a942f0dafdb8c2cec7825f6eba2f5
+F src/sqliteInt.h 986281c5cc398a02b1b7911808fe80e99e8826e2
 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
 F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
 F src/table.c 22744786199c9195720c15a7a42cb97b2e2728d8
@@ -630,7 +630,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P d9e826942673ad048d611c014bfbee39ab5535c8
-R 4c58f8d518f4d7642e26335d639dedc9
-U drh
-Z 9a733289185c8757aa19d0d86da78658
+P e333c3f4c3629dba05b58318e2cd0514843e5394
+R 8f01b0f2eeb7eb8624edfef58dbe76a2
+U shane
+Z 94943e24fb9ab172c32144f86dec2f9a

diff --git a/manifest.uuid b/manifest.uuid
index 93db9dd96a8f7adf6d8ce336ff155dd2a6131a1c..7333a9e3e4779f5b019ce637e347872397e15581 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e333c3f4c3629dba05b58318e2cd0514843e5394
\ No newline at end of file
+821c387d159fd86cedb56c1130f0416bf5c65e6c
\ No newline at end of file

diff --git a/src/malloc.c b/src/malloc.c
index 61e1c1dbff58b3d54e52a19c59a5430d82eba884..439405d53e8a4fa87ba101be8bcc98bccb21a6b8 100644 (file)
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -12,7 +12,7 @@
 **
 ** Memory allocation functions used throughout sqlite.
 **
-** $Id: malloc.c,v 1.40 2008/09/02 17:52:52 danielk1977 Exp $
+** $Id: malloc.c,v 1.41 2008/09/04 04:32:49 shane Exp $
 */
 #include "sqliteInt.h"
 #include <stdarg.h>
@@ -45,9 +45,9 @@ void sqlite3_soft_heap_limit(int n){
   }
   sqlite3_initialize();
   if( iLimit>0 ){
-    sqlite3_memory_alarm(softHeapLimitEnforcer, 0, iLimit);
+    sqlite3MemoryAlarm(softHeapLimitEnforcer, 0, iLimit);
   }else{
-    sqlite3_memory_alarm(0, 0, 0);
+    sqlite3MemoryAlarm(0, 0, 0);
   }
   overage = sqlite3_memory_used() - n;
   if( overage>0 ){
@@ -183,7 +183,7 @@ sqlite3_int64 sqlite3_memory_highwater(int resetFlag){
 /*
 ** Change the alarm callback
 */
-int sqlite3_memory_alarm(
+int sqlite3MemoryAlarm(
   void(*xCallback)(void *pArg, sqlite3_int64 used,int N),
   void *pArg,
   sqlite3_int64 iThreshold
@@ -196,6 +196,18 @@ int sqlite3_memory_alarm(
   return SQLITE_OK;
 }
 
+/*
+** Deprecated external interface.  Internal/core SQLite code
+** should call sqlite3MemoryAlarm.
+*/
+int sqlite3_memory_alarm(
+  void(*xCallback)(void *pArg, sqlite3_int64 used,int N),
+  void *pArg,
+  sqlite3_int64 iThreshold
+){
+  return sqlite3MemoryAlarm(xCallback, pArg, iThreshold);
+}
+
 /*
 ** Trigger the alarm 
 */

diff --git a/src/prepare.c b/src/prepare.c
index c7fc343b1c6859b31f1b5e693a7158c120984000..26a420a02c7a8825a7bd1a682161494363e9da3f 100644 (file)
--- a/src/prepare.c
+++ b/src/prepare.c
@@ -13,7 +13,7 @@
 ** interface, and routines that contribute to loading the database schema
 ** from disk.
 **
-** $Id: prepare.c,v 1.93 2008/08/20 16:35:10 drh Exp $
+** $Id: prepare.c,v 1.94 2008/09/04 04:32:49 shane Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -692,7 +692,7 @@ int sqlite3Reprepare(Vdbe *p){
     assert( pNew!=0 );
   }
   sqlite3VdbeSwap((Vdbe*)pNew, p);
-  sqlite3_transfer_bindings(pNew, (sqlite3_stmt*)p);
+  sqlite3TransferBindings(pNew, (sqlite3_stmt*)p);
   sqlite3VdbeResetStepResult((Vdbe*)pNew);
   sqlite3VdbeFinalize((Vdbe*)pNew);
   return 1;

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 3f8529d8f2c2f1ea57441dafeb35c6494dfefc13..75ae5293f8a33e80a3218e6b0bb7ef0a7274307b 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.769 2008/09/02 14:07:24 danielk1977 Exp $
+** @(#) $Id: sqliteInt.h,v 1.770 2008/09/04 04:32:49 shane Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
@@ -2041,6 +2041,7 @@ const sqlite3_mem_methods *sqlite3MemGetMemsys5(void);
 const sqlite3_mem_methods *sqlite3MemGetMemsys3(void);
 const sqlite3_mem_methods *sqlite3MemGetMemsys6(void);
 void sqlite3BenignMallocHooks(void (*)(void), void (*)(void));
+int sqlite3MemoryAlarm(void (*)(void*, sqlite3_int64, int), void*, sqlite3_int64);
 
 #ifndef SQLITE_MUTEX_NOOP
   sqlite3_mutex_methods *sqlite3DefaultMutex(void);
@@ -2442,6 +2443,7 @@ int sqlite3VtabCallDestroy(sqlite3*, int, const char *);
 int sqlite3VtabBegin(sqlite3 *, sqlite3_vtab *);
 FuncDef *sqlite3VtabOverloadFunction(sqlite3 *,FuncDef*, int nArg, Expr*);
 void sqlite3InvalidFunction(sqlite3_context*,int,sqlite3_value**);
+int sqlite3TransferBindings(sqlite3_stmt *, sqlite3_stmt *);
 int sqlite3Reprepare(Vdbe*);
 void sqlite3ExprListCheckLength(Parse*, ExprList*, const char*);
 CollSeq *sqlite3BinaryCompareCollSeq(Parse *, Expr *, Expr *);