/ Check-in [73634ca4]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix typo in a macro name: "GlogUpperToLower" should be "GlobUpperToLower"
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:73634ca463f46027bfa8ea23f18abaa530460e24
User & Date: drh 2013-09-12 23:12:08
Context
2013-09-13
12:10
Add tests for the fts4 unicode61 tokenchars and separators options. check-in: 9ce6f40d user: dan tags: trunk
2013-09-12
23:12
Fix typo in a macro name: "GlogUpperToLower" should be "GlobUpperToLower" check-in: 73634ca4 user: drh tags: trunk
02:09
For error log messages generated by the Win32 native allocator, make sure the correct format specifier is used for the value returned by GetLastError(). check-in: 75a8a8c1 user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/func.c.

   540    540   ** For LIKE and GLOB matching on EBCDIC machines, assume that every
   541    541   ** character is exactly one byte in size.  Also, all characters are
   542    542   ** able to participate in upper-case-to-lower-case mappings in EBCDIC
   543    543   ** whereas only characters less than 0x80 do in ASCII.
   544    544   */
   545    545   #if defined(SQLITE_EBCDIC)
   546    546   # define sqlite3Utf8Read(A)    (*((*A)++))
   547         -# define GlogUpperToLower(A)   A = sqlite3UpperToLower[A]
          547  +# define GlobUpperToLower(A)   A = sqlite3UpperToLower[A]
   548    548   #else
   549         -# define GlogUpperToLower(A)   if( !((A)&~0x7f) ){ A = sqlite3UpperToLower[A]; }
          549  +# define GlobUpperToLower(A)   if( !((A)&~0x7f) ){ A = sqlite3UpperToLower[A]; }
   550    550   #endif
   551    551   
   552    552   static const struct compareInfo globInfo = { '*', '?', '[', 0 };
   553    553   /* The correct SQL-92 behavior is for the LIKE operator to ignore
   554    554   ** case.  Thus  'a' LIKE 'A' would be true. */
   555    555   static const struct compareInfo likeInfoNorm = { '%', '_',   0, 1 };
   556    556   /* If SQLITE_CASE_SENSITIVE_LIKE is defined, then the LIKE operator
................................................................................
   621    621           while( *zString && patternCompare(&zPattern[-1],zString,pInfo,esc)==0 ){
   622    622             SQLITE_SKIP_UTF8(zString);
   623    623           }
   624    624           return *zString!=0;
   625    625         }
   626    626         while( (c2 = sqlite3Utf8Read(&zString))!=0 ){
   627    627           if( noCase ){
   628         -          GlogUpperToLower(c2);
   629         -          GlogUpperToLower(c);
          628  +          GlobUpperToLower(c2);
          629  +          GlobUpperToLower(c);
   630    630             while( c2 != 0 && c2 != c ){
   631    631               c2 = sqlite3Utf8Read(&zString);
   632         -            GlogUpperToLower(c2);
          632  +            GlobUpperToLower(c2);
   633    633             }
   634    634           }else{
   635    635             while( c2 != 0 && c2 != c ){
   636    636               c2 = sqlite3Utf8Read(&zString);
   637    637             }
   638    638           }
   639    639           if( c2==0 ) return 0;
................................................................................
   677    677           return 0;
   678    678         }
   679    679       }else if( esc==c && !prevEscape ){
   680    680         prevEscape = 1;
   681    681       }else{
   682    682         c2 = sqlite3Utf8Read(&zString);
   683    683         if( noCase ){
   684         -        GlogUpperToLower(c);
   685         -        GlogUpperToLower(c2);
          684  +        GlobUpperToLower(c);
          685  +        GlobUpperToLower(c2);
   686    686         }
   687    687         if( c!=c2 ){
   688    688           return 0;
   689    689         }
   690    690         prevEscape = 0;
   691    691       }
   692    692     }