Overview
Comment: | Various minor style improvements |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
b090b5ce92d5466fec03963bf746c884 |
User & Date: | js on 2018-11-17 22:59:10 |
Other Links: | manifest | tags |
Context
2018-11-17
| ||
23:13 | OFDNSResolver: Make sure queries live long enough check-in: d062db6708 user: js tags: trunk | |
22:59 | Various minor style improvements check-in: b090b5ce92 user: js tags: trunk | |
22:53 | OFEnumerator: Make allObjects a method check-in: 003c448269 user: js tags: trunk | |
Changes
Modified src/OFDictionary.m from [bf56568780] to [eb95483289].
︙ | ︙ | |||
674 675 676 677 678 679 680 | } - (OFXMLElement *)XMLElementBySerializing { void *pool = objc_autoreleasePoolPush(); OFXMLElement *element; OFEnumerator *keyEnumerator, *objectEnumerator; | | | 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 | } - (OFXMLElement *)XMLElementBySerializing { void *pool = objc_autoreleasePoolPush(); OFXMLElement *element; OFEnumerator *keyEnumerator, *objectEnumerator; id <OFSerialization> key, object; if ([self isKindOfClass: [OFMutableDictionary class]]) element = [OFXMLElement elementWithName: @"OFMutableDictionary" namespace: OF_SERIALIZATION_NS]; else element = [OFXMLElement elementWithName: @"OFDictionary" namespace: OF_SERIALIZATION_NS]; |
︙ | ︙ |
Modified src/OFHTTPClient.m from [00205fa304] to [1e684aefeb].
︙ | ︙ | |||
374 375 376 377 378 379 380 | /* * 303 means the request should be converted to a GET * request before redirection. This also means stripping * the entity of the request. */ if (_status == 303) { OFEnumerator *keyEnumerator, *objectEnumerator; | | | 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 | /* * 303 means the request should be converted to a GET * request before redirection. This also means stripping * the entity of the request. */ if (_status == 303) { OFEnumerator *keyEnumerator, *objectEnumerator; OFString *key, *object; keyEnumerator = [headers keyEnumerator]; objectEnumerator = [headers objectEnumerator]; while ((key = [keyEnumerator nextObject]) != nil && (object = [objectEnumerator nextObject]) != nil) |
︙ | ︙ | |||
605 606 607 608 609 610 611 | * * We do not use the socket's write buffer in case we need to resend * the entire request (e.g. in case a keep-alive connection timed out). */ @try { OFString *requestString = constructRequestString(_request); | < < | | | 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 | * * We do not use the socket's write buffer in case we need to resend * the entire request (e.g. in case a keep-alive connection timed out). */ @try { OFString *requestString = constructRequestString(_request); /* * Pass requestString as context to retain it so that the * underlying buffer lives long enough. */ [sock asyncWriteBuffer: [requestString UTF8String] length: [requestString UTF8StringLength] target: self selector: @selector(socket:didWriteRequest: length:context:exception:) context: requestString]; } @catch (id e) { [self raiseException: e]; return; |
︙ | ︙ |
Modified src/OFHTTPCookie.m from [45d455ab28] to [dd9d50afa9].
︙ | ︙ | |||
24 25 26 27 28 29 30 | #import "OFURL.h" #import "OFInvalidFormatException.h" static void handleAttribute(OFHTTPCookie *cookie, OFString *name, OFString *value) { | | | | | | | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | #import "OFURL.h" #import "OFInvalidFormatException.h" static void handleAttribute(OFHTTPCookie *cookie, OFString *name, OFString *value) { OFString *lowercaseName = [name lowercaseString]; if (value != nil) { if ([lowercaseName isEqual: @"expires"]) { OFDate *date = [OFDate dateWithDateString: value format: @"%a, %d %b %Y %H:%M:%S %z"]; [cookie setExpires: date]; } else if ([lowercaseName isEqual: @"max-age"]) { OFDate *date = [OFDate dateWithTimeIntervalSinceNow: [value decimalValue]]; [cookie setExpires: date]; } else if ([lowercaseName isEqual: @"domain"]) [cookie setDomain: value]; else if ([lowercaseName isEqual: @"path"]) [cookie setPath: value]; else [[cookie extensions] addObject: [OFString stringWithFormat: @"%@=%@", name, value]]; } else { if ([lowercaseName isEqual: @"secure"]) [cookie setSecure: true]; else if ([lowercaseName isEqual: @"httponly"]) [cookie setHTTPOnly: true]; else if ([name length] > 0) [[cookie extensions] addObject: name]; } } @implementation OFHTTPCookie |
︙ | ︙ |
Modified src/OFLocale.m from [6ed03ca549] to [42da1c8269].
︙ | ︙ | |||
180 181 182 183 184 185 186 | @try { #ifndef OF_AMIGAOS char *locale, *messagesLocale = NULL; if (currentLocale != nil) @throw [OFInitializationFailedException | | | 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 | @try { #ifndef OF_AMIGAOS char *locale, *messagesLocale = NULL; if (currentLocale != nil) @throw [OFInitializationFailedException exceptionWithClass: [self class]]; _encoding = OF_STRING_ENCODING_UTF_8; _decimalPoint = @"."; _localizedStrings = [[OFMutableArray alloc] init]; if ((locale = setlocale(LC_ALL, "")) != NULL) _decimalPoint = [[OFString alloc] |
︙ | ︙ |
Modified src/OFString+JSONValue.m from [0d9de1d0b0] to [5af43d3b89].
︙ | ︙ | |||
455 456 457 458 459 460 461 | if (++(*pointer) >= stop) return nil; if (--depthLimit == 0) return nil; while (**pointer != '}') { | > | | 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 | if (++(*pointer) >= stop) return nil; if (--depthLimit == 0) return nil; while (**pointer != '}') { OFString *key; id object; skipWhitespacesAndComments(pointer, stop, line); if (*pointer >= stop) return nil; if (**pointer == '}') break; |
︙ | ︙ | |||
485 486 487 488 489 490 491 | if ((**pointer >= 'a' && **pointer <= 'z') || (**pointer >= 'A' && **pointer <= 'Z') || **pointer == '_' || **pointer == '$' || **pointer == '\\') key = parseIdentifier(pointer, stop); else key = nextObject(pointer, stop, line, depthLimit); | | | 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 | if ((**pointer >= 'a' && **pointer <= 'z') || (**pointer >= 'A' && **pointer <= 'Z') || **pointer == '_' || **pointer == '$' || **pointer == '\\') key = parseIdentifier(pointer, stop); else key = nextObject(pointer, stop, line, depthLimit); if (![key isKindOfClass: [OFString class]]) return nil; skipWhitespacesAndComments(pointer, stop, line); if (*pointer + 1 >= stop || **pointer != ':') return nil; (*pointer)++; |
︙ | ︙ |
Modified src/OFString+PathAdditions_AmigaOS.m from [d2ed7eeb87] to [27c449dbd8].
︙ | ︙ | |||
101 102 103 104 105 106 107 | { /* * AmigaOS needs the full parsing to determine the last path component. * This could be optimized by not creating the temporary objects, * though. */ void *pool = objc_autoreleasePoolPush(); | < | | 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 | { /* * AmigaOS needs the full parsing to determine the last path component. * This could be optimized by not creating the temporary objects, * though. */ void *pool = objc_autoreleasePoolPush(); OFString *ret = [[self pathComponents] lastObject]; [ret retain]; objc_autoreleasePoolPop(pool); return [ret autorelease]; } - (OFString *)pathExtension |
︙ | ︙ |
Modified src/OFString.m from [77745cd7d6] to [049410036d].
︙ | ︙ | |||
2362 2363 2364 2365 2366 2367 2368 | [object length] == 0) { [array removeObjectAtIndex: i]; done = false; break; } | | < | 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 | [object length] == 0) { [array removeObjectAtIndex: i]; done = false; break; } if ([object isEqual: @".."] && parent != nil && ![parent isEqual: @".."]) { [array removeObjectsInRange: of_range(i - 1, 2)]; done = false; break; } |
︙ | ︙ |
Modified src/OFXMLElement.m from [8558828739] to [cd5a521542].
︙ | ︙ | |||
283 284 285 286 287 288 289 | self = [super of_init]; @try { void *pool = objc_autoreleasePoolPush(); OFXMLElement *attributesElement, *namespacesElement; OFXMLElement *childrenElement; OFEnumerator *keyEnumerator, *objectEnumerator; | | | 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 | self = [super of_init]; @try { void *pool = objc_autoreleasePoolPush(); OFXMLElement *attributesElement, *namespacesElement; OFXMLElement *childrenElement; OFEnumerator *keyEnumerator, *objectEnumerator; OFString *key, *object; if (![[element name] isEqual: [self className]] || ![[element namespace] isEqual: OF_SERIALIZATION_NS]) @throw [OFInvalidArgumentException exception]; _name = [[[element attributeForName: @"name"] stringValue] copy]; |
︙ | ︙ | |||
324 325 326 327 328 329 330 | if ((_attributes != nil && ![_attributes isKindOfClass: [OFMutableArray class]]) || (_namespaces != nil && ![_namespaces isKindOfClass: [OFMutableDictionary class]]) || (_children != nil && ![_children isKindOfClass: [OFMutableArray class]])) @throw [OFInvalidArgumentException exception]; | | | | 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 | if ((_attributes != nil && ![_attributes isKindOfClass: [OFMutableArray class]]) || (_namespaces != nil && ![_namespaces isKindOfClass: [OFMutableDictionary class]]) || (_children != nil && ![_children isKindOfClass: [OFMutableArray class]])) @throw [OFInvalidArgumentException exception]; for (OFXMLAttribute *attribute in _attributes) if (![attribute isKindOfClass: [OFXMLAttribute class]]) @throw [OFInvalidArgumentException exception]; keyEnumerator = [_namespaces keyEnumerator]; objectEnumerator = [_namespaces objectEnumerator]; while ((key = [keyEnumerator nextObject]) != nil && (object = [objectEnumerator nextObject]) != nil) if (![key isKindOfClass: [OFString class]] || |
︙ | ︙ | |||
445 446 447 448 449 450 451 | ? parent->_namespace : (OFString *)@"")]; /* Add the namespaces of the current element */ if (allNamespaces != nil) { OFEnumerator *keyEnumerator = [_namespaces keyEnumerator]; OFEnumerator *objectEnumerator = [_namespaces objectEnumerator]; OFMutableDictionary *tmp; | | | 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 | ? parent->_namespace : (OFString *)@"")]; /* Add the namespaces of the current element */ if (allNamespaces != nil) { OFEnumerator *keyEnumerator = [_namespaces keyEnumerator]; OFEnumerator *objectEnumerator = [_namespaces objectEnumerator]; OFMutableDictionary *tmp; OFString *key, *object; tmp = [[allNamespaces mutableCopy] autorelease]; while ((key = [keyEnumerator nextObject]) != nil && (object = [objectEnumerator nextObject]) != nil) [tmp setObject: object forKey: key]; |
︙ | ︙ |