From: danielk1977 <danielk1977@noemail.net>
Date: Mon, 23 Jun 2008 11:11:35 +0000 (+0000)
Subject: Correct comments above sqlite3_release_memory() and sqlite3_soft_heap_limit(). Ticket... 
X-Git-Tag: version-3.6.10~902
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8468024da8188db7fcc9aed9220597f7e9009a16;p=thirdparty%2Fsqlite.git

Correct comments above sqlite3_release_memory() and sqlite3_soft_heap_limit(). Ticket #3138. (CVS 5275)

FossilOrigin-Name: 3240446853a11f5a1e379d4841d0268873aad64d
---

diff --git a/manifest b/manifest
index 80e0cd41f4..79410008c7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\swhereby\sopening\sa\sconnection\sto\san\sexisting\sshared-cache\scaused\sthe\scache-size\s(the\svalue\sconfigured\sby\s"PRAGMA\scache_size")\sto\srevert\sto\sits\sdefault\svalue.\s(CVS\s5274)
-D 2008-06-23T09:50:51
+C Correct\scomments\sabove\ssqlite3_release_memory()\sand\ssqlite3_soft_heap_limit().\sTicket\s#3138.\s(CVS\s5275)
+D 2008-06-23T11:11:36
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in ff6f90048555a0088f6a4b7406bed5e55a7c4eff
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -116,7 +116,7 @@ F src/journal.c cffd2cd214e58c0e99c3ff632b3bee6c7cbb260e
 F src/legacy.c 3626c71fb70912abec9a4312beba753a9ce800df
 F src/loadext.c 40024a0f476c1279494876b9a002001b29e5d3e3
 F src/main.c e9a760651620c9dd6e86224ef4cada9fb71ad898
-F src/malloc.c d4339af305c2cb62fbecc2c533b3169dec315d44
+F src/malloc.c a3c5f9bf0073ee3f60c098a9d95ca0f1cb2c81c2
 F src/md5.c 008216bbb5d34c6fbab5357aa68575ad8a31516a
 F src/mem1.c 159f10e280f2d9aea597cf938851e61652dd5c3d
 F src/mem2.c 23f9538f35fbcd5665afe7056a56be0c7ed65aa7
@@ -592,7 +592,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P e7610890b4df78af5bb8f3e8f8d05ef5cf36e186
-R c4d643cc756037ad7486bb96e515e495
+P 0492aa8ed3c35dd2cdfc69c9cb87e43ef0460826
+R 4c31894c9cf394f503a7801352b88b5a
 U danielk1977
-Z aadad94b6ce5d63b330c8f427e6c96a1
+Z eb3d57a29e7dcb8bb596438786438280
diff --git a/manifest.uuid b/manifest.uuid
index 6ce461f15a..7c79749aed 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0492aa8ed3c35dd2cdfc69c9cb87e43ef0460826
\ No newline at end of file
+3240446853a11f5a1e379d4841d0268873aad64d
\ No newline at end of file
diff --git a/src/malloc.c b/src/malloc.c
index 85ac1f133b..0aa348b2c0 100644
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -12,7 +12,7 @@
 **
 ** Memory allocation functions used throughout sqlite.
 **
-** $Id: malloc.c,v 1.23 2008/06/21 08:12:15 danielk1977 Exp $
+** $Id: malloc.c,v 1.24 2008/06/23 11:11:36 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <stdarg.h>
@@ -32,8 +32,8 @@ static void softHeapLimitEnforcer(
 }
 
 /*
-** Set the soft heap-size limit for the current thread. Passing a
-** zero or negative value indicates no limit.
+** Set the soft heap-size limit for the library. Passing a zero or 
+** negative value indicates no limit.
 */
 void sqlite3_soft_heap_limit(int n){
   sqlite3_uint64 iLimit;
@@ -56,7 +56,9 @@ void sqlite3_soft_heap_limit(int n){
 }
 
 /*
-** Release memory held by SQLite instances created by the current thread.
+** Attempt to release up to n bytes of non-essential memory currently
+** held by SQLite. An example of non-essential memory is memory used to
+** cache database pages that are not currently in use.
 */
 int sqlite3_release_memory(int n){
 #ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT