Overview
| Comment: | Update to BinaryPack1pre2. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
c4df7d61b6a8543d6dff48e468d01ea4 |
| User & Date: | js on 2013-02-24 10:41:35 |
| Other Links: | manifest | tags |
Context
|
2013-02-24
| ||
| 11:03 | Add missing file to Xcode project. check-in: 4710e7867b user: js tags: trunk | |
| 10:41 | Update to BinaryPack1pre2. check-in: c4df7d61b6 user: js tags: trunk | |
|
2013-02-23
| ||
| 18:00 | Disallow \u0000 in JSON and fix ObjFW.h. check-in: 9c24db3c6d user: js tags: trunk | |
Changes
Modified src/OFDataArray+BinaryPackValue.m from [2abd788e61] to [5af444f490].
| ︙ | ︙ | |||
271 272 273 274 275 276 277 | *object = [OFNumber numberWithBool: NO]; return 1; /* true */ case 0xC3: *object = [OFNumber numberWithBool: YES]; return 1; /* Data */ | | | | | | | | 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 | *object = [OFNumber numberWithBool: NO]; return 1; /* true */ case 0xC3: *object = [OFNumber numberWithBool: YES]; return 1; /* Data */ case 0xD5: if (length < 2) goto error; count = buffer[1]; if (length < count + 2) goto error; *object = [OFDataArray dataArrayWithItemSize: 1 capacity: count]; [*object addItems: buffer + 2 count: count]; return count + 2; case 0xD6: if (length < 3) goto error; count = read_uint16(buffer + 1); if (length < count + 3) goto error; *object = [OFDataArray dataArrayWithItemSize: 1 capacity: count]; [*object addItems: buffer + 3 count: count]; return count + 3; case 0xD7: if (length < 5) goto error; count = read_uint32(buffer + 1); if (length < count + 5) goto error; *object = [OFDataArray dataArrayWithItemSize: 1 capacity: count]; [*object addItems: buffer + 5 count: count]; return count + 5; /* Strings */ case 0xD9: if (length < 2) goto error; count = buffer[1]; if (length < count + 2) goto error; *object = [OFString stringWithUTF8String: (const char*)buffer + 2 length: count]; return count + 2; case 0xDA: if (length < 3) goto error; count = read_uint16(buffer + 1); if (length < count + 3) goto error; *object = [OFString stringWithUTF8String: (const char*)buffer + 3 length: count]; return count + 3; case 0xDB: if (length < 5) goto error; count = read_uint32(buffer + 1); if (length < count + 5) goto error; |
| ︙ | ︙ |
Modified src/OFDataArray.m from [0daf2b33bf] to [7955bfc3cd].
| ︙ | ︙ | |||
623 624 625 626 627 628 629 |
if (_itemSize != 1)
@throw [OFInvalidArgumentException
exceptionWithClass: [self class]
selector: _cmd];
if (_count <= UINT8_MAX) {
| | | | | 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 |
if (_itemSize != 1)
@throw [OFInvalidArgumentException
exceptionWithClass: [self class]
selector: _cmd];
if (_count <= UINT8_MAX) {
uint8_t type = 0xD5;
uint8_t tmp = (uint8_t)_count;
data = [OFDataArray dataArrayWithItemSize: 1
capacity: _count + 2];
[data addItem: &type];
[data addItem: &tmp];
} else if (_count <= UINT16_MAX) {
uint8_t type = 0xD6;
uint16_t tmp = OF_BSWAP16_IF_LE((uint16_t)_count);
data = [OFDataArray dataArrayWithItemSize: 1
capacity: _count + 3];
[data addItem: &type];
[data addItems: &tmp
count: sizeof(tmp)];
} else if (_count <= UINT32_MAX) {
uint8_t type = 0xD7;
uint32_t tmp = OF_BSWAP32_IF_LE((uint32_t)_count);
data = [OFDataArray dataArrayWithItemSize: 1
capacity: _count + 5];
[data addItem: &type];
[data addItems: &tmp
|
| ︙ | ︙ |
Modified src/OFString.m from [d8fe56c8e7] to [2d59404d46].
| ︙ | ︙ | |||
1600 1601 1602 1603 1604 1605 1606 |
uint8_t tmp = 0xA0 | ((uint8_t)length & 0x1F);
data = [OFDataArray dataArrayWithItemSize: 1
capacity: length + 1];
[data addItem: &tmp];
} else if (length <= UINT8_MAX) {
| | | | | 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 |
uint8_t tmp = 0xA0 | ((uint8_t)length & 0x1F);
data = [OFDataArray dataArrayWithItemSize: 1
capacity: length + 1];
[data addItem: &tmp];
} else if (length <= UINT8_MAX) {
uint8_t type = 0xD9;
uint8_t tmp = (uint8_t)length;
data = [OFDataArray dataArrayWithItemSize: 1
capacity: length + 2];
[data addItem: &type];
[data addItem: &tmp];
} else if (length <= UINT16_MAX) {
uint8_t type = 0xDA;
uint16_t tmp = OF_BSWAP16_IF_LE((uint16_t)length);
data = [OFDataArray dataArrayWithItemSize: 1
capacity: length + 3];
[data addItem: &type];
[data addItems: &tmp
count: sizeof(tmp)];
} else if (length <= UINT32_MAX) {
uint8_t type = 0xDB;
uint32_t tmp = OF_BSWAP32_IF_LE((uint32_t)length);
data = [OFDataArray dataArrayWithItemSize: 1
capacity: length + 5];
[data addItem: &type];
[data addItems: &tmp
|
| ︙ | ︙ |
Modified src/macros.h from [b86826e574] to [03ac2254d3].
| ︙ | ︙ | |||
317 318 319 320 321 322 323 | # define OF_BSWAP_DOUBLE_IF_LE(i) OF_BSWAP_DOUBLE(i) #endif /* * We define it here and not in objfw-defs.h, as it would be theoretically * possible to build a universal binary for Mac OS X and iOS. */ | | | 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 | # define OF_BSWAP_DOUBLE_IF_LE(i) OF_BSWAP_DOUBLE(i) #endif /* * We define it here and not in objfw-defs.h, as it would be theoretically * possible to build a universal binary for Mac OS X and iOS. */ #if defined(__APPLE__) && defined(__arm__) # define OF_IOS #endif #define OF_ROL(value, bits) \ (((value) << ((bits) % (sizeof(value) * 8))) | \ (value) >> (sizeof(value) * 8 - ((bits) % (sizeof(value) * 8)))) #define OF_ROR(value, bits) \ |
| ︙ | ︙ |