Differences From Artifact [5df935f0d5]:
- File
src/OFDataArray.m
— part of check-in
[44f45c2e35]
at
2017-01-09 17:36:36
on branch trunk
— Update copyright
Forgot to add 2017, even though I already did quite some changes in
2017. (user: js, size: 14889) [annotate] [blame] [check-ins using]
To Artifact [08874136fe]:
- File
src/OFDataArray.m
— part of check-in
[4af49a13c3]
at
2017-05-07 20:10:13
on branch trunk
— Small code style change
Casts are now written like types in variable declarations. (user: js, size: 14914) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
79 80 81 82 83 84 85 |
capacity: (size_t)capacity
{
return [[[self alloc] initWithItemSize: itemSize
capacity: capacity] autorelease];
}
#ifdef OF_HAVE_FILES
| | | | | | 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 |
capacity: (size_t)capacity
{
return [[[self alloc] initWithItemSize: itemSize
capacity: capacity] autorelease];
}
#ifdef OF_HAVE_FILES
+ (instancetype)dataArrayWithContentsOfFile: (OFString *)path
{
return [[[self alloc] initWithContentsOfFile: path] autorelease];
}
#endif
#if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS)
+ (instancetype)dataArrayWithContentsOfURL: (OFURL *)URL
{
return [[[self alloc] initWithContentsOfURL: URL] autorelease];
}
#endif
+ (instancetype)dataArrayWithStringRepresentation: (OFString *)string
{
return [[[self alloc]
initWithStringRepresentation: string] autorelease];
}
+ (instancetype)dataArrayWithBase64EncodedString: (OFString *)string
{
return [[[self alloc] initWithBase64EncodedString: string] autorelease];
}
- init
{
self = [super init];
|
| ︙ | ︙ | |||
150 151 152 153 154 155 156 | @throw e; } return self; } #ifdef OF_HAVE_FILES | | | 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 |
@throw e;
}
return self;
}
#ifdef OF_HAVE_FILES
- initWithContentsOfFile: (OFString *)path
{
@try {
OFFile *file = [[OFFile alloc] initWithPath: path
mode: @"rb"];
of_offset_t size = [[OFFileManager defaultManager]
sizeOfFileAtPath: path];
|
| ︙ | ︙ | |||
192 193 194 195 196 197 198 | } return self; } #endif #if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS) | | | 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 |
}
return self;
}
#endif
#if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS)
- initWithContentsOfURL: (OFURL *)URL
{
void *pool;
OFString *scheme;
pool = objc_autoreleasePoolPush();
scheme = [URL scheme];
|
| ︙ | ︙ | |||
272 273 274 275 276 277 278 | objc_autoreleasePoolPop(pool); return self; } #endif | | | 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 |
objc_autoreleasePoolPop(pool);
return self;
}
#endif
- initWithStringRepresentation: (OFString *)string
{
@try {
const char *cString;
size_t count;
count = [string
cStringLengthWithEncoding: OF_STRING_ENCODING_ASCII];
|
| ︙ | ︙ | |||
324 325 326 327 328 329 330 | [self release]; @throw e; } return self; } | | | | 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 |
[self release];
@throw e;
}
return self;
}
- initWithBase64EncodedString: (OFString *)string
{
self = [self initWithItemSize: 1
capacity: [string length] / 3];
@try {
if (!of_base64_decode(self, [string cStringWithEncoding:
OF_STRING_ENCODING_ASCII], [string
cStringLengthWithEncoding: OF_STRING_ENCODING_ASCII]))
@throw [OFInvalidFormatException exception];
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- initWithSerialization: (OFXMLElement *)element
{
@try {
void *pool = objc_autoreleasePoolPush();
OFString *stringValue;
if (![[element name] isEqual: [self className]] ||
![[element namespace] isEqual: OF_SERIALIZATION_NS])
|
| ︙ | ︙ | |||
370 371 372 373 374 375 376 |
}
- (size_t)count
{
return _count;
}
| | | | | | | | | | 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 |
}
- (size_t)count
{
return _count;
}
- (void *)items
{
return _items;
}
- (void *)itemAtIndex: (size_t)index
{
if (index >= _count)
@throw [OFOutOfRangeException exception];
return _items + index * _itemSize;
}
- (void *)firstItem
{
if (_items == NULL || _count == 0)
return NULL;
return _items;
}
- (void *)lastItem
{
if (_items == NULL || _count == 0)
return NULL;
return _items + (_count - 1) * _itemSize;
}
- (void)addItem: (const void *)item
{
if (SIZE_MAX - _count < 1)
@throw [OFOutOfRangeException exception];
if (_count + 1 > _capacity) {
_items = [self resizeMemory: _items
size: _itemSize
count: _count + 1];
_capacity = _count + 1;
}
memcpy(_items + _count * _itemSize, item, _itemSize);
_count++;
}
- (void)insertItem: (const void *)item
atIndex: (size_t)index
{
[self insertItems: item
atIndex: index
count: 1];
}
- (void)addItems: (const void *)items
count: (size_t)count
{
if (count > SIZE_MAX - _count)
@throw [OFOutOfRangeException exception];
if (_count + count > _capacity) {
_items = [self resizeMemory: _items
size: _itemSize
count: _count + count];
_capacity = _count + count;
}
memcpy(_items + _count * _itemSize, items, count * _itemSize);
_count += count;
}
- (void)insertItems: (const void *)items
atIndex: (size_t)index
count: (size_t)count
{
if (count > SIZE_MAX - _count || index > _count)
@throw [OFOutOfRangeException exception];
if (_count + count > _capacity) {
|
| ︙ | ︙ | |||
551 552 553 554 555 556 557 | OFDataArray *dataArray; int comparison; size_t count, minCount; if (![object isKindOfClass: [OFDataArray class]]) @throw [OFInvalidArgumentException exception]; | | | 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 | OFDataArray *dataArray; int comparison; size_t count, minCount; if (![object isKindOfClass: [OFDataArray class]]) @throw [OFInvalidArgumentException exception]; dataArray = (OFDataArray *)object; if ([dataArray itemSize] != _itemSize) @throw [OFInvalidArgumentException exception]; count = [dataArray count]; minCount = (_count > count ? count : _count); |
| ︙ | ︙ | |||
582 583 584 585 586 587 588 |
- (uint32_t)hash
{
uint32_t hash;
OF_HASH_INIT(hash);
for (size_t i = 0; i < _count * _itemSize; i++)
| | | | | | | | | 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 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 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 |
- (uint32_t)hash
{
uint32_t hash;
OF_HASH_INIT(hash);
for (size_t i = 0; i < _count * _itemSize; i++)
OF_HASH_ADD(hash, ((uint8_t *)_items)[i]);
OF_HASH_FINALIZE(hash);
return hash;
}
- (OFString *)description
{
OFMutableString *ret = [OFMutableString stringWithString: @"<"];
for (size_t i = 0; i < _count; i++) {
if (i > 0)
[ret appendString: @" "];
for (size_t j = 0; j < _itemSize; j++)
[ret appendFormat: @"%02x", _items[i * _itemSize + j]];
}
[ret appendString: @">"];
[ret makeImmutable];
return ret;
}
- (OFString *)stringRepresentation
{
OFMutableString *ret = [OFMutableString string];
for (size_t i = 0; i < _count; i++)
for (size_t j = 0; j < _itemSize; j++)
[ret appendFormat: @"%02x", _items[i * _itemSize + j]];
[ret makeImmutable];
return ret;
}
- (OFString *)stringByBase64Encoding
{
return of_base64_encode(_items, _count * _itemSize);
}
#ifdef OF_HAVE_FILES
- (void)writeToFile: (OFString *)path
{
OFFile *file = [[OFFile alloc] initWithPath: path
mode: @"wb"];
@try {
[file writeBuffer: _items
length: _count * _itemSize];
} @finally {
[file release];
}
}
#endif
- (OFXMLElement *)XMLElementBySerializing
{
void *pool;
OFXMLElement *element;
if (_itemSize != 1)
@throw [OFInvalidArgumentException exception];
pool = objc_autoreleasePoolPush();
element = [OFXMLElement
elementWithName: [self className]
namespace: OF_SERIALIZATION_NS
stringValue: of_base64_encode(_items, _count * _itemSize)];
[element retain];
objc_autoreleasePoolPop(pool);
return [element autorelease];
}
- (OFDataArray *)messagePackRepresentation
{
OFDataArray *data;
if (_itemSize != 1)
@throw [OFInvalidArgumentException exception];
if (_count <= UINT8_MAX) {
|
| ︙ | ︙ |