Differences From Artifact [b110ce39ff]:
- File
src/OFString+JSONValue.m
— part of check-in
[c5ef582958]
at
2013-03-04 17:20:15
on branch trunk
— Replace BOOL with bool.
The only places where BOOL is left are those where they are required by
the ABI. (user: js, size: 13063) [annotate] [blame] [check-ins using]
To Artifact [a402664fc6]:
- File src/OFString+JSONValue.m — part of check-in [8fe08864f8] at 2013-04-09 22:09:15 on branch trunk — Fix incomplete of_char16_t migration. (user: js, size: 13075) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
107 108 109 110 111 112 113 | old = *pointer; skipWhitespaces(pointer, stop, line); skipComment(pointer, stop, line); } } | | | | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 | old = *pointer; skipWhitespaces(pointer, stop, line); skipComment(pointer, stop, line); } } static inline of_char16_t parseUnicodeEscape(const char *pointer, const char *stop) { of_char16_t ret = 0; char i; if (pointer + 5 >= stop) return 0xFFFF; if (pointer[0] != '\\' || pointer[1] != 'u') return 0xFFFF; |
︙ | ︙ | |||
190 191 192 193 194 195 196 | break; case 't': buffer[i++] = '\t'; (*pointer)++; break; /* Parse unicode escape sequence */ case 'u':; | | | 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 | break; case 't': buffer[i++] = '\t'; (*pointer)++; break; /* Parse unicode escape sequence */ case 'u':; of_char16_t c1, c2; of_unichar_t c; size_t l; c1 = parseUnicodeEscape(*pointer - 1, stop); if (c1 == 0xFFFF) { free(buffer); return nil; |
︙ | ︙ | |||
309 310 311 312 313 314 315 | (**pointer >= 'A' && **pointer <= 'Z') || (**pointer >= '0' && **pointer <= '9') || **pointer == '_' || **pointer == '$' || (**pointer & 0x80)) { buffer[i++] = **pointer; (*pointer)++; } else if (**pointer == '\\') { | | | 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 | (**pointer >= 'A' && **pointer <= 'Z') || (**pointer >= '0' && **pointer <= '9') || **pointer == '_' || **pointer == '$' || (**pointer & 0x80)) { buffer[i++] = **pointer; (*pointer)++; } else if (**pointer == '\\') { of_char16_t c1, c2; of_unichar_t c; size_t l; if (++(*pointer) >= stop || **pointer != 'u') { free(buffer); return nil; } |
︙ | ︙ |