From: mistachkin <mistachkin@noemail.net>
Date: Tue, 13 Aug 2013 22:33:41 +0000 (+0000)
Subject: Fix an outdated comment and a comment typo.  No changes to code.
X-Git-Tag: version-3.8.0~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=037933b8a75f01013fc7fb2899dc06c57eef30dc;p=thirdparty%2Fsqlite.git

Fix an outdated comment and a comment typo.  No changes to code.

FossilOrigin-Name: ac336959490083ffeaaf25aaec97ecb59a2f4536
---

diff --git a/manifest b/manifest
index 6cc104b469..c1132e63b5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C If\sthe\sSQLITE_EXTRA_INIT\sfunction\sis\sdefined,\smake\ssure\sit\sis\scalled\sonly\nonce\sby\sthe\seffective\ssqlite3_initialize()\scall.
-D 2013-08-08T14:38:45.404
+C Fix\san\soutdated\scomment\sand\sa\scomment\stypo.\s\sNo\schanges\sto\scode.
+D 2013-08-13T22:33:41.968
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -185,7 +185,7 @@ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
 F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
 F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
-F src/main.c f6eb795f17eb88205b55e5116fb37e6593707d82
+F src/main.c 4e4cd5c2ee09db496c0dde79b507bba6b8bcbdcb
 F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@ -1105,7 +1105,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 3adb6c1bfda897859dc9cf9ae7f1e6719855ee68
-R f58cae922c11c825e7cdfcd2f4c52823
-U drh
-Z 6adac74ecb750c6ba6eb610c8156f9d8
+P e2b597cafe7c8a8313b051d6a302fed54f235727
+R 725a28de0f0d05555ad0060ad37d65c5
+U mistachkin
+Z 538f6198c3d2d5189ca428ea230684f3
diff --git a/manifest.uuid b/manifest.uuid
index cb24e03baa..57d601b84e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e2b597cafe7c8a8313b051d6a302fed54f235727
\ No newline at end of file
+ac336959490083ffeaaf25aaec97ecb59a2f4536
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 217221d238..6932bf7b9d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -448,8 +448,8 @@ int sqlite3_config(int op, ...){
         memset(&sqlite3GlobalConfig.m, 0, sizeof(sqlite3GlobalConfig.m));
       }else{
         /* The heap pointer is not NULL, then install one of the
-        ** mem5.c/mem3.c methods. If neither ENABLE_MEMSYS3 nor
-        ** ENABLE_MEMSYS5 is defined, return an error.
+        ** mem5.c/mem3.c methods.  The enclosing #if guarantees at
+        ** least one of these methods is currently enabled.
         */
 #ifdef SQLITE_ENABLE_MEMSYS3
         sqlite3GlobalConfig.m = *sqlite3MemGetMemsys3();
@@ -468,7 +468,7 @@ int sqlite3_config(int op, ...){
       break;
     }
     
-    /* Record a pointer to the logger funcction and its first argument.
+    /* Record a pointer to the logger function and its first argument.
     ** The default is NULL.  Logging is disabled if the function pointer is
     ** NULL.
     */