Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix harmless compiler warnings in the unicode2 logic of FTS3 and FTS5. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
703029ac6d24860230a8c30fcbf5e7e1 |
| User & Date: | drh 2019-01-02 23:49:47 |
Context
|
2019-01-03
| ||
| 00:44 | Fix the geopoly_svg() function so that it returns NULL when given zero arguments. check-in: 120cb176 user: drh tags: trunk | |
|
2019-01-02
| ||
| 23:49 | Fix harmless compiler warnings in the unicode2 logic of FTS3 and FTS5. check-in: 703029ac user: drh tags: trunk | |
| 16:01 | Add another test case to vacuum-into.test. check-in: 0465d2fc user: dan tags: trunk | |
Changes
Changes to ext/fts3/fts3_unicode2.c.
1 1 /* 2 -** 2012 May 25 2 +** 2012-05-25 3 3 ** 4 4 ** The author disclaims copyright to this source code. In place of 5 5 ** a legal notice, here is a blessing: 6 6 ** 7 7 ** May you do good and not evil. 8 8 ** May you find forgiveness for yourself and forgive others. 9 9 ** May you share freely, never taking more than you give. ................................................................................ 174 174 61726, 61784, 61800, 61816, 61836, 61880, 61896, 61914, 175 175 61948, 61998, 62062, 62122, 62154, 62184, 62200, 62218, 176 176 62252, 62302, 62364, 62410, 62442, 62478, 62536, 62554, 177 177 62584, 62604, 62640, 62648, 62656, 62664, 62730, 62766, 178 178 62830, 62890, 62924, 62974, 63032, 63050, 63082, 63118, 179 179 63182, 63242, 63274, 63310, 63368, 63390, 180 180 }; 181 -#define HIBIT ((char)0x80) 182 - char aChar[] = { 181 +#define HIBIT ((unsigned char)0x80) 182 + unsigned char aChar[] = { 183 183 '\0', 'a', 'c', 'e', 'i', 'n', 184 184 'o', 'u', 'y', 'y', 'a', 'c', 185 185 'd', 'e', 'e', 'g', 'h', 'i', 186 186 'j', 'k', 'l', 'n', 'o', 'r', 187 187 's', 't', 'u', 'u', 'w', 'y', 188 188 'z', 'o', 'u', 'a', 'i', 'o', 189 189 'u', 'u'|HIBIT, 'a'|HIBIT, 'g', 'k', 'o',
Changes to ext/fts3/unicode/mkunicode.tcl.
59 59 incr i 60 60 61 61 puts -nonewline [format "%5d" [expr ($iCode<<3) + $nRange-1]] 62 62 puts -nonewline ", " 63 63 } 64 64 puts "" 65 65 puts " \};" 66 - puts "#define HIBIT ((char)0x80)" 67 - puts " char aChar\[\] = \{" 66 + puts "#define HIBIT ((unsigned char)0x80)" 67 + puts " unsigned char aChar\[\] = \{" 68 68 puts -nonewline " '\\0', " 69 69 set i 1 70 70 foreach c $aChar f $aFlag { 71 71 if { $f } { 72 72 set str "'$c'|HIBIT, " 73 73 } else { 74 74 set str "'$c', " ................................................................................ 834 834 puts "\}" 835 835 } 836 836 837 837 838 838 proc print_fileheader {} { 839 839 puts [string trim { 840 840 /* 841 -** 2012 May 25 841 +** 2012-05-25 842 842 ** 843 843 ** The author disclaims copyright to this source code. In place of 844 844 ** a legal notice, here is a blessing: 845 845 ** 846 846 ** May you do good and not evil. 847 847 ** May you find forgiveness for yourself and forgive others. 848 848 ** May you share freely, never taking more than you give.
Changes to ext/fts5/fts5_unicode2.c.
1 1 /* 2 -** 2012 May 25 2 +** 2012-05-25 3 3 ** 4 4 ** The author disclaims copyright to this source code. In place of 5 5 ** a legal notice, here is a blessing: 6 6 ** 7 7 ** May you do good and not evil. 8 8 ** May you find forgiveness for yourself and forgive others. 9 9 ** May you share freely, never taking more than you give. ................................................................................ 43 43 61726, 61784, 61800, 61816, 61836, 61880, 61896, 61914, 44 44 61948, 61998, 62062, 62122, 62154, 62184, 62200, 62218, 45 45 62252, 62302, 62364, 62410, 62442, 62478, 62536, 62554, 46 46 62584, 62604, 62640, 62648, 62656, 62664, 62730, 62766, 47 47 62830, 62890, 62924, 62974, 63032, 63050, 63082, 63118, 48 48 63182, 63242, 63274, 63310, 63368, 63390, 49 49 }; 50 -#define HIBIT ((char)0x80) 51 - char aChar[] = { 50 +#define HIBIT ((unsigned char)0x80) 51 + unsigned char aChar[] = { 52 52 '\0', 'a', 'c', 'e', 'i', 'n', 53 53 'o', 'u', 'y', 'y', 'a', 'c', 54 54 'd', 'e', 'e', 'g', 'h', 'i', 55 55 'j', 'k', 'l', 'n', 'o', 'r', 56 56 's', 't', 'u', 'u', 'w', 'y', 57 57 'z', 'o', 'u', 'a', 'i', 'o', 58 58 'u', 'u'|HIBIT, 'a'|HIBIT, 'g', 'k', 'o',