Fossil SCM
Slightly more efficient than previous commit
Commit
1ca598325e65101444daf14effd9b4e42b78ea47
Parent
acf7fe47bf427ef…
1 file changed
+3
-6
+3
-6
| --- src/lookslike.c | ||
| +++ src/lookslike.c | ||
| @@ -162,17 +162,14 @@ | ||
| 162 | 162 | if( ((c2<0xc2) || (c2>=0xf4) || ((c&0xc0)!=0x80)) && |
| 163 | 163 | (((c2!=0xf4) || (c>=0x90)) && ((c2!=0xc0) || (c!=0x80))) ){ |
| 164 | 164 | return LOOK_INVALID; /* Invalid UTF-8 */ |
| 165 | 165 | } |
| 166 | 166 | if( c2>=0xe0 ){ |
| 167 | - if( c2>=0xf0 ){ | |
| 168 | - if (c2==0xf0 && c<0x90) return LOOK_INVALID; /* Invalid UTF-8 */ | |
| 169 | - c = (c2<<1)|3; | |
| 170 | - }else{ | |
| 171 | - if (c2==0xe0 && c<0xa0) return LOOK_INVALID; /* Invalid UTF-8 */ | |
| 172 | - c = (c2<<1)|3; | |
| 167 | + if ((c2==0xf0 && c<0x90)||(c2==0xe0 && c<0xa0)){ | |
| 168 | + return LOOK_INVALID; /* Invalid UTF-8, too short */ | |
| 173 | 169 | } |
| 170 | + c = (c2<<1)|3; | |
| 174 | 171 | }else{ |
| 175 | 172 | c = ' '; |
| 176 | 173 | } |
| 177 | 174 | } |
| 178 | 175 | } |
| 179 | 176 |
| --- src/lookslike.c | |
| +++ src/lookslike.c | |
| @@ -162,17 +162,14 @@ | |
| 162 | if( ((c2<0xc2) || (c2>=0xf4) || ((c&0xc0)!=0x80)) && |
| 163 | (((c2!=0xf4) || (c>=0x90)) && ((c2!=0xc0) || (c!=0x80))) ){ |
| 164 | return LOOK_INVALID; /* Invalid UTF-8 */ |
| 165 | } |
| 166 | if( c2>=0xe0 ){ |
| 167 | if( c2>=0xf0 ){ |
| 168 | if (c2==0xf0 && c<0x90) return LOOK_INVALID; /* Invalid UTF-8 */ |
| 169 | c = (c2<<1)|3; |
| 170 | }else{ |
| 171 | if (c2==0xe0 && c<0xa0) return LOOK_INVALID; /* Invalid UTF-8 */ |
| 172 | c = (c2<<1)|3; |
| 173 | } |
| 174 | }else{ |
| 175 | c = ' '; |
| 176 | } |
| 177 | } |
| 178 | } |
| 179 |
| --- src/lookslike.c | |
| +++ src/lookslike.c | |
| @@ -162,17 +162,14 @@ | |
| 162 | if( ((c2<0xc2) || (c2>=0xf4) || ((c&0xc0)!=0x80)) && |
| 163 | (((c2!=0xf4) || (c>=0x90)) && ((c2!=0xc0) || (c!=0x80))) ){ |
| 164 | return LOOK_INVALID; /* Invalid UTF-8 */ |
| 165 | } |
| 166 | if( c2>=0xe0 ){ |
| 167 | if ((c2==0xf0 && c<0x90)||(c2==0xe0 && c<0xa0)){ |
| 168 | return LOOK_INVALID; /* Invalid UTF-8, too short */ |
| 169 | } |
| 170 | c = (c2<<1)|3; |
| 171 | }else{ |
| 172 | c = ' '; |
| 173 | } |
| 174 | } |
| 175 | } |
| 176 |