Fix typos in commands. Combine the ExpandBlob and expandBlob macros into one.

FossilOrigin-Name: fc9179e154751b51ddef429600d30a89d4a098bd

diff --git a/ext/fts3/fts3_porter.c b/ext/fts3/fts3_porter.c
index 148c57008818b86d6bc7863370dc2f310cf9810e..84aa13222915ac3a9b46dd1f7d8653c14c45ee50 100644 (file)
--- a/ext/fts3/fts3_porter.c
+++ b/ext/fts3/fts3_porter.c
@@ -40,7 +40,7 @@ typedef struct porter_tokenizer {
 } porter_tokenizer;
 
 /*
-** Class derived from sqlit3_tokenizer_cursor
+** Class derived from sqlite3_tokenizer_cursor
 */
 typedef struct porter_tokenizer_cursor {
   sqlite3_tokenizer_cursor base;

diff --git a/manifest b/manifest
index c257086d2044634c1132a391b0bbe95ba233f382..761dc881e16f10d881e2d6e4dc89cd5b6cf568bd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthe\sshared-memory\sfilename\ssythesized\sby\sos_win.c\sis\ndouble-zero\sterminated,\sso\sthat\sit\scan\sbe\sused\swith\nsqlite3_uri_parameter().
-D 2012-01-08T12:32:09.101
+C Fix\stypos\sin\scommands.\s\sCombine\sthe\sExpandBlob\sand\sexpandBlob\smacros\sinto\sone.
+D 2012-01-08T22:18:33.638
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -71,7 +71,7 @@ F ext/fts3/fts3_expr.c f5df26bddf46a5916b2a5f80c4027996e92b7b15
 F ext/fts3/fts3_hash.c 8dd2d06b66c72c628c2732555a32bc0943114914
 F ext/fts3/fts3_hash.h 8331fb2206c609f9fc4c4735b9ab5ad6137c88ec
 F ext/fts3/fts3_icu.c 6c8f395cdf9e1e3afa7fadb7e523dbbf381c6dfa
-F ext/fts3/fts3_porter.c 8d946908f4812c005d3d33fcbe78418b1f4eb70c
+F ext/fts3/fts3_porter.c b7e5276f9f0a5fc7018b6fa55ce0f31f269ef881
 F ext/fts3/fts3_snippet.c 1f9ee6a8e0e242649645968dcec4deb253d86c2a
 F ext/fts3/fts3_term.c a5457992723455a58804cb75c8cbd8978db5c2ef
 F ext/fts3/fts3_test.c 24fa13f330db011500acb95590da9eee24951894
@@ -173,7 +173,7 @@ F src/pager.h 5cd760857707529b403837d813d86b68938d6183
 F src/parse.y fabb2e7047417d840e6fdb3ef0988a86849a08ba
 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
 F src/pcache.h b1d8775a9bddf44e65edb0d20bfc57a4982f840f
-F src/pcache1.c e1aaa3bc9bbfd8b0bc391ca731f5f8185467375d
+F src/pcache1.c 281822d22265245b19f908cb3f5df725f7e11b06
 F src/pragma.c dd66f21fafe7be40e1a48ad4195764cc191cf583
 F src/prepare.c ec4989f7f480544bdc4192fe663470d2a2d7d61e
 F src/printf.c 7ffb4ebb8b341f67e049695ba031da717b3d2699
@@ -240,13 +240,13 @@ F src/update.c d3076782c887c10e882996550345da9c4c9f9dea
 F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
 F src/util.c d124c1f192bdcac733908fadd186f943788e7d2b
 F src/vacuum.c 0c0ba2242355c6048d65e2b333abe0f7c06348fa
-F src/vdbe.c d5062ca4c623b92cecbfa005458a9a4b92f162cf
+F src/vdbe.c 64e3fc0bb56c54ceac3cc1d1e65257bfda21550e
 F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
-F src/vdbeInt.h 88e4d5d717946bfed800a6383c53883484f1a35e
+F src/vdbeInt.h ef9b8584b23b033894a0804dc6b90196c6779fb9
 F src/vdbeapi.c 3662b6a468a2a4605a15dfab313baa6dff81ad91
 F src/vdbeaux.c eb13a6917ed7455b5b49236fe5cfb3d3c3e4c57b
 F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
-F src/vdbemem.c dadc7465860ad2e980f01c9b0b1ba44903249257
+F src/vdbemem.c 4f7d25d5ea2e2040254095b8f6de07f8dbbadf80
 F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790
 F src/vdbetrace.c d6e50e04e1ec498150e519058f617d91b8f5c843
 F src/vtab.c e9318d88feac85be8e27ee783ac8f5397933fc8a
@@ -986,7 +986,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 9612bcd648c7654050ddb2f955a28cbc527a8c2e
-R 95d1a97796762e7fa611b2e7679423fa
+P 429380f99c59ca10de18638ce6f9ec7c47082999
+R 9b790a47dcff0bf2c5786bcb4562c116
 U drh
-Z 0e6e9f43dd6869980e38d7503d0545f4
+Z 8f90de0c23a8df1cb3585afb30babe53

diff --git a/manifest.uuid b/manifest.uuid
index 8519133a4b2f7a7d60fe2237a072a179ded6f4ed..463a7e20cf4a63346cd7ab918231142e7501b04f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-429380f99c59ca10de18638ce6f9ec7c47082999
\ No newline at end of file
+fc9179e154751b51ddef429600d30a89d4a098bd
\ No newline at end of file

diff --git a/src/pcache1.c b/src/pcache1.c
index 405ae5aec89b309345c027352bdad62c54ec9200..f76d7c8e8ea39c413cba52ba2e7bac0b7baeb62a 100644 (file)
--- a/src/pcache1.c
+++ b/src/pcache1.c
@@ -40,7 +40,7 @@ typedef struct PGroup PGroup;
 ** Mode 1 uses more memory (since PCache instances are not able to rob
 ** unused pages from other PCaches) but it also operates without a mutex,
 ** and is therefore often faster.  Mode 2 requires a mutex in order to be
-** threadsafe, but is able recycle pages more efficient.
+** threadsafe, but recycles pages more efficiently.
 **
 ** For mode (1), PGroup.mutex is NULL.  For mode (2) there is only a single
 ** PGroup which is the pcache1.grp global variable and its mutex is
@@ -66,7 +66,7 @@ struct PGroup {
 struct PCache1 {
   /* Cache configuration parameters. Page size (szPage) and the purgeable
   ** flag (bPurgeable) are set when the cache is created. nMax may be 
-  ** modified at any time by a call to the pcache1CacheSize() method.
+  ** modified at any time by a call to the pcache1Cachesize() method.
   ** The PGroup mutex must be held when accessing nMax.
   */
   PGroup *pGroup;                     /* PGroup this cache belongs to */
@@ -357,7 +357,7 @@ void sqlite3PageFree(void *p){
 ** for all page cache needs and we should not need to spill the
 ** allocation onto the heap.
 **
-** Or, the heap is used for all page cache memory put the heap is
+** Or, the heap is used for all page cache memory but the heap is
 ** under memory pressure, then again it is desirable to avoid
 ** allocating a new page cache entry in order to avoid stressing
 ** the heap even further.
@@ -668,7 +668,7 @@ static int pcache1Pagecount(sqlite3_pcache *p){
 ** For a non-purgeable cache (a cache used as the storage for an in-memory
 ** database) there is really no difference between createFlag 1 and 2.  So
 ** the calling function (pcache.c) will never have a createFlag of 1 on
-** a non-purgable cache.
+** a non-purgeable cache.
 **
 ** There are three different approaches to obtaining space for a page,
 ** depending on the value of parameter createFlag (which may be 0, 1 or 2).

diff --git a/src/vdbe.c b/src/vdbe.c
index 5696d1f0100ef4aaa31453d256e68f9001f481a8..52e904dc4ecca465db0bb0f287e2ef1ea9384bf0 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -151,12 +151,6 @@ int sqlite3_found_count = 0;
    if( ((P)->flags&MEM_Ephem)!=0 \
        && sqlite3VdbeMemMakeWriteable(P) ){ goto no_mem;}
 
-/*
-** Call sqlite3VdbeMemExpandBlob() on the supplied value (type Mem*)
-** P if required.
-*/
-#define ExpandBlob(P) (((P)->flags&MEM_Zero)?sqlite3VdbeMemExpandBlob(P):0)
-
 /* Return true if the cursor was opened using the OP_OpenSorter opcode. */
 #ifdef SQLITE_OMIT_MERGE_SORT
 # define isSorter(x) 0

diff --git a/src/vdbeInt.h b/src/vdbeInt.h
index e3687cf14db1eb0b4568c1d55cc5badca7944f9d..2a96cc514865cf38d58b2ce816f3883ffb42b48c 100644 (file)
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@ -465,8 +465,10 @@ int sqlite3VdbeMemHandleBom(Mem *pMem);
 
 #ifndef SQLITE_OMIT_INCRBLOB
   int sqlite3VdbeMemExpandBlob(Mem *);
+  #define ExpandBlob(P) (((P)->flags&MEM_Zero)?sqlite3VdbeMemExpandBlob(P):0)
 #else
   #define sqlite3VdbeMemExpandBlob(x) SQLITE_OK
+  #define ExpandBlob(P) SQLITE_OK
 #endif
 
 #endif /* !defined(_VDBEINT_H_) */

diff --git a/src/vdbemem.c b/src/vdbemem.c
index 0c7859431924dd05750923824382faa010ef64c4..f8777a791d8efeded51bfa142c7be30cca4c0b18 100644 (file)
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -18,12 +18,6 @@
 #include "sqliteInt.h"
 #include "vdbeInt.h"
 
-/*
-** Call sqlite3VdbeMemExpandBlob() on the supplied value (type Mem*)
-** P if required.
-*/
-#define expandBlob(P) (((P)->flags&MEM_Zero)?sqlite3VdbeMemExpandBlob(P):0)
-
 /*
 ** If pMem is an object with a valid string representation, this routine
 ** ensures the internal encoding for the string representation is
@@ -123,7 +117,7 @@ int sqlite3VdbeMemMakeWriteable(Mem *pMem){
   int f;
   assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
   assert( (pMem->flags&MEM_RowSet)==0 );
-  expandBlob(pMem);
+  ExpandBlob(pMem);
   f = pMem->flags;
   if( (f&(MEM_Str|MEM_Blob)) && pMem->z!=pMem->zMalloc ){
     if( sqlite3VdbeMemGrow(pMem, pMem->n + 2, 1) ){
@@ -960,7 +954,7 @@ const void *sqlite3ValueText(sqlite3_value* pVal, u8 enc){
   }
   assert( (MEM_Blob>>3) == MEM_Str );
   pVal->flags |= (pVal->flags & MEM_Blob)>>3;
-  expandBlob(pVal);
+  ExpandBlob(pVal);
   if( pVal->flags&MEM_Str ){
     sqlite3VdbeChangeEncoding(pVal, enc & ~SQLITE_UTF16_ALIGNED);
     if( (enc & SQLITE_UTF16_ALIGNED)!=0 && 1==(1&SQLITE_PTR_TO_INT(pVal->z)) ){