Change non-exported memory interfaces to following the naming conventions. (CVS 4797)

FossilOrigin-Name: 94774b41429c8bfa3582e30c09f414b9e5669575

diff --git a/manifest b/manifest
index e1227d5cbc9129d3d48287708217f34b846e2910..0ed3cdf47e5ffc2a7eac2017a29157e99b70068b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\s16-bit\sintegers\sfor\sindexing\swithin\sa\spage\sin\sbtree.\s\sTighter\nbounds\son\sthe\smaximum\snumber\sof\scells\swithin\sone\spage.\s(CVS\s4796)
-D 2008-02-19T14:59:35
+C Change\snon-exported\smemory\sinterfaces\sto\sfollowing\sthe\snaming\sconventions.\s(CVS\s4797)
+D 2008-02-19T15:15:16
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in bc2b5df3e3d0d4b801b824b7ef6dec43812b049b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -107,10 +107,10 @@ F src/main.c b4014b71979a58d6aa79549fdf87175ab7bdf1cc
 F src/malloc.c 60e392a4c12c839517f9b0db7b995f825444fb35
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/mem1.c 62a821702d3292809ca78e7c55c3ca04b05a3757
-F src/mem2.c 021eecbb210cfe90a8e7be9f04b01329d2c38851
-F src/mem3.c 979191678eb1aac0af7e5df9ab3897a07410ff4c
+F src/mem2.c a17fd71f39e593f46445282c36077231e70a31eb
+F src/mem3.c 52547678a2ae50c203d54be1a5bf51eb02438a3f
 F src/mem4.c 45c328ec6dcb7e8d319cb383615b5fe547ca5409
-F src/mem5.c 13ddb3073c5ad55251730b692c663acc468d0eff
+F src/mem5.c 11d98b76f77873aab86b543cbd1a8ddc4e680d58
 F src/mutex.c 3259f62c2429967aee6dc112117a6d2f499ef061
 F src/mutex.h 079fa6fe9da18ceb89e79012c010594c6672addb
 F src/mutex_os2.c 19ab15764736f13b94b4f70e53f77547cbddd47a
@@ -159,7 +159,7 @@ F src/test_config.c 9223ff4a7b8b97c9d12965b0123db1cbd6757efb
 F src/test_devsym.c fd8884c2269fb7e0db2c52d21ec59d31a33790ba
 F src/test_hexio.c 1a1cd8324d57585ea86b922f609fa1fbaaf9662d
 F src/test_loadext.c 22065d601a18878e5542191001f0eaa5d77c0ed8
-F src/test_malloc.c cd0ac01205056b6690563ff6b68d91fbd6a27d8a
+F src/test_malloc.c 85e702341c752810017c94c40f2a1ac92128abc0
 F src/test_md5.c c107c96637123239c3518b5fbe97a79130f4d32e
 F src/test_onefile.c 54282b6796d55d7acc489be83b89b8715e7d3756
 F src/test_schema.c 12c9de7661d6294eec2d57afbb52e2af1128084f
@@ -621,7 +621,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 63da5d97542e4f54c33329833477c8d96ce05dd0
-R c8ab8ac21acd2b72e6ae16ee8ae7de7c
+P 8fdbe4abab4e9c292111579b03471f68c1e855fb
+R ffd2f20a735264530a3840b731c9c29f
 U drh
-Z a0e228bb49973ef017165e1ce93bd308
+Z c45d168ad6e6cadeaabc43c10b516ff1

diff --git a/manifest.uuid b/manifest.uuid
index d1b234090972144efd99d4616c8b8becc821e84a..f3bc1607972fc284825b3ffa2d1bc68d367ead2e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8fdbe4abab4e9c292111579b03471f68c1e855fb
\ No newline at end of file
+94774b41429c8bfa3582e30c09f414b9e5669575
\ No newline at end of file

diff --git a/src/mem2.c b/src/mem2.c
index 45c0266149d4673343b101f2974cbf4b57396bbe..41d9720fd9a9cc753e49f3d3a87689f54af60757 100644 (file)
--- a/src/mem2.c
+++ b/src/mem2.c
@@ -12,7 +12,7 @@
 ** This file contains the C functions that implement a memory
 ** allocation subsystem for use by SQLite.  
 **
-** $Id: mem2.c,v 1.21 2008/02/14 23:26:56 drh Exp $
+** $Id: mem2.c,v 1.22 2008/02/19 15:15:16 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -382,7 +382,7 @@ void *sqlite3_realloc(void *pPrior, int nByte){
 ** A value of zero turns of backtracing.  The number is always rounded
 ** up to a multiple of 2.
 */
-void sqlite3_memdebug_backtrace(int depth){
+void sqlite3MemdebugBacktrace(int depth){
   if( depth<0 ){ depth = 0; }
   if( depth>20 ){ depth = 20; }
   depth = (depth+1)&0xfe;
@@ -392,7 +392,7 @@ void sqlite3_memdebug_backtrace(int depth){
 /*
 ** Set the title string for subsequent allocations.
 */
-void sqlite3_memdebug_settitle(const char *zTitle){
+void sqlite3MemdebugSettitle(const char *zTitle){
   int n = strlen(zTitle) + 1;
   enterMem();
   if( n>=sizeof(mem.zTitle) ) n = sizeof(mem.zTitle)-1;
@@ -406,7 +406,7 @@ void sqlite3_memdebug_settitle(const char *zTitle){
 ** Open the file indicated and write a log of all unfreed memory 
 ** allocations into that log.
 */
-void sqlite3_memdebug_dump(const char *zFilename){
+void sqlite3MemdebugDump(const char *zFilename){
   FILE *out;
   struct MemBlockHdr *pHdr;
   void **pBt;
@@ -445,7 +445,7 @@ void sqlite3_memdebug_dump(const char *zFilename){
 /*
 ** Return the number of times sqlite3_malloc() has been called.
 */
-int sqlite3_memdebug_malloc_count(){
+int sqlite3MemdebugMallocCount(){
   int i;
   int nTotal = 0;
   for(i=0; i<NCSIZE; i++){

diff --git a/src/mem3.c b/src/mem3.c
index 02fdcec2b82f825a89f9bf51cad2b84ec27db1b3..9f15bc64241934cb0db5ec74d66234eae81f86b7 100644 (file)
--- a/src/mem3.c
+++ b/src/mem3.c
@@ -20,7 +20,7 @@
 ** This version of the memory allocation subsystem is used if
 ** and only if SQLITE_MEMORY_SIZE is defined.
 **
-** $Id: mem3.c,v 1.11 2008/02/14 23:26:56 drh Exp $
+** $Id: mem3.c,v 1.12 2008/02/19 15:15:16 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -578,7 +578,7 @@ void *sqlite3_realloc(void *pPrior, int nBytes){
 ** Open the file indicated and write a log of all unfreed memory 
 ** allocations into that log.
 */
-void sqlite3_memdebug_dump(const char *zFilename){
+void sqlite3MemdebugDump(const char *zFilename){
 #ifdef SQLITE_DEBUG
   FILE *out;
   int i, j;

diff --git a/src/mem5.c b/src/mem5.c
index e73b13aae1d4a2df8ac9d070943e80cf01ca74f9..4250cfa94976f2cf106093d3941cb8c54ffdad1f 100644 (file)
--- a/src/mem5.c
+++ b/src/mem5.c
@@ -20,7 +20,7 @@
 ** This version of the memory allocation subsystem is used if
 ** and only if SQLITE_POW2_MEMORY_SIZE is defined.
 **
-** $Id: mem5.c,v 1.3 2008/02/18 22:24:58 drh Exp $
+** $Id: mem5.c,v 1.4 2008/02/19 15:15:16 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -470,7 +470,7 @@ void *sqlite3_realloc(void *pPrior, int nBytes){
 ** Open the file indicated and write a log of all unfreed memory 
 ** allocations into that log.
 */
-void sqlite3_memdebug_dump(const char *zFilename){
+void sqlite3MemdebugDump(const char *zFilename){
 #ifdef SQLITE_DEBUG
   FILE *out;
   int i, j, n;

diff --git a/src/test_malloc.c b/src/test_malloc.c
index 642e5c7d03516d41bac25b1ab38fc17b73f1e1d8..86a32059fd15d298e170296bcf561278528c80ca 100644 (file)
--- a/src/test_malloc.c
+++ b/src/test_malloc.c
@@ -13,7 +13,7 @@
 ** This file contains code used to implement test interfaces to the
 ** memory allocation subsystem.
 **
-** $Id: test_malloc.c,v 1.14 2008/02/18 22:24:58 drh Exp $
+** $Id: test_malloc.c,v 1.15 2008/02/19 15:15:16 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -312,8 +312,8 @@ static int test_memdebug_backtrace(
   if( Tcl_GetIntFromObj(interp, objv[1], &depth) ) return TCL_ERROR;
 #ifdef SQLITE_MEMDEBUG
   {
-    extern void sqlite3_memdebug_backtrace(int);
-    sqlite3_memdebug_backtrace(depth);
+    extern void sqlite3MemdebugBacktrace(int);
+    sqlite3MemdebugBacktrace(depth);
   }
 #endif
   return TCL_OK;
@@ -337,8 +337,8 @@ static int test_memdebug_dump(
 #if defined(SQLITE_MEMDEBUG) || defined(SQLITE_MEMORY_SIZE) \
      || defined(SQLITE_POW2_MEMORY_SIZE)
   {
-    extern void sqlite3_memdebug_dump(const char*);
-    sqlite3_memdebug_dump(Tcl_GetString(objv[1]));
+    extern void sqlite3MemdebugDump(const char*);
+    sqlite3MemdebugDump(Tcl_GetString(objv[1]));
   }
 #endif
   return TCL_OK;
@@ -362,8 +362,8 @@ static int test_memdebug_malloc_count(
   }
 #if defined(SQLITE_MEMDEBUG)
   {
-    extern int sqlite3_memdebug_malloc_count();
-    nMalloc = sqlite3_memdebug_malloc_count();
+    extern int sqlite3MemdebugMallocCount();
+    nMalloc = sqlite3MemdebugMallocCount();
   }
 #endif
   Tcl_SetObjResult(interp, Tcl_NewIntObj(nMalloc));
@@ -503,8 +503,8 @@ static int test_memdebug_settitle(
   zTitle = Tcl_GetString(objv[1]);
 #ifdef SQLITE_MEMDEBUG
   {
-    extern int sqlite3_memdebug_settitle(const char*);
-    sqlite3_memdebug_settitle(zTitle);
+    extern int sqlite3MemdebugSettitle(const char*);
+    sqlite3MemdebugSettitle(zTitle);
   }
 #endif
   return TCL_OK;