From: drh <drh@noemail.net>
Date: Wed, 24 Aug 2011 15:18:16 +0000 (+0000)
Subject: Updates to the sqlite3_mem_methods documentation.
X-Git-Tag: version-3.7.8~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d1017e47f4c268b88955c3037b2833e11a32cd5;p=thirdparty%2Fsqlite.git

Updates to the sqlite3_mem_methods documentation.

FossilOrigin-Name: 988998fe7b0a21ed113b67f812e51f357045bef4
---

diff --git a/manifest b/manifest
index 5a36cb7c61..0615137744 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssome\sharmless\scompiler\swarnings.
-D 2011-08-24T15:12:08.059
+C Updates\sto\sthe\ssqlite3_mem_methods\sdocumentation.
+D 2011-08-24T15:18:16.947
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8c930e7b493d59099ea1304bd0f2aed152eb3315
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -181,7 +181,7 @@ F src/resolve.c 36368f44569208fa074e61f4dd0b6c4fb60ca2b4
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c d219c4b68d603cc734b6f9b1e2780fee12a1fa0d
 F src/shell.c bbe7818ff5bc8614105ceb81ad67b8bdc0b671dd
-F src/sqlite.h.in 0b3cab7b2ea51f58396e8871fa5f349cfece5330
+F src/sqlite.h.in 0a6c9c23337fd1352c5c75a613ff9533aa7d91cb
 F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
 F src/sqliteInt.h ba4a6d6288efb25b84bc0d7d0aaf80f9b42523ba
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
@@ -961,7 +961,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
-P 04111ce980df9692b7fe65a36105e7de9627a3bb
-R 28cff34240de2d39e36bc50cfecb7bd9
+P 46f5a68bfa4199a4bd398030bf88bfbb4df3d5ca
+R 153cb3ab6156bae4555a624a64dd86d1
 U drh
-Z 9b59b931d9884ee79534f52b494533df
+Z 489994766712dfe3d3bf81175cae5684
diff --git a/manifest.uuid b/manifest.uuid
index 1e28c0a8c2..1206faf6ce 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-46f5a68bfa4199a4bd398030bf88bfbb4df3d5ca
\ No newline at end of file
+988998fe7b0a21ed113b67f812e51f357045bef4
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index eb5f7a02a0..ba5c20265f 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -1205,16 +1205,10 @@ int sqlite3_db_config(sqlite3*, int op, ...);
 ** order to verify that SQLite recovers gracefully from such
 ** conditions.
 **
-** The xMalloc and xFree methods must work like the
-** malloc() and free() functions from the standard C library.
-** The xRealloc method must work like realloc() from the standard C library
-** with the exception that if the second argument to xRealloc is zero,
-** xRealloc must be a no-op - it must not perform any allocation or
-** deallocation.  ^SQLite guarantees that the second argument to
+** The xMalloc, xRealloc, and xFree methods must work like the
+** malloc(), realloc() and free() functions from the standard C library.
+** ^SQLite guarantees that the second argument to
 ** xRealloc is always a value returned by a prior call to xRoundup.
-** And so in cases where xRoundup always returns a positive number,
-** xRealloc can perform exactly as the standard library realloc() and
-** still be in compliance with this specification.
 **
 ** xSize should return the allocated size of a memory allocation
 ** previously obtained from xMalloc or xRealloc.  The allocated size