Differences From Artifact [6ad29027d7]:
- File src/OFXMLParser.m — part of check-in [062a052b50] at 2010-04-17 15:46:34 on branch trunk — Don't return self where not necessary, return void or something useful. (user: js, size: 13779) [annotate] [blame] [check-ins using]
To Artifact [3568485abb]:
- File
src/OFXMLParser.m
— part of check-in
[37db8f0fb3]
at
2010-04-17 22:27:17
on branch trunk
— New ivar naming convention.
ivars are now named like this: thisIsAnIVar. If an accessor exists for
the ivar, the ivar is named like the accessor. This is required for
@property to work. (user: js, size: 13765) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
107 108 109 110 111 112 113 | [delegate release]; [cache release]; [name release]; [prefix release]; [ns release]; [attrs release]; | | | | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 | [delegate release]; [cache release]; [name release]; [prefix release]; [ns release]; [attrs release]; [attrName release]; [attrPrefix release]; [previous release]; [super dealloc]; } - (id)delegate { |
︙ | ︙ | |||
355 356 357 358 359 360 361 | withLength: len]; cache_c = [cache cString]; cache_len = [cache cStringLength]; if ((tmp = memchr(cache_c, ':', cache_len)) != NULL ) { | | | | | | 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 | withLength: len]; cache_c = [cache cString]; cache_len = [cache cStringLength]; if ((tmp = memchr(cache_c, ':', cache_len)) != NULL ) { attrName = [[OFString alloc] initWithCString: tmp + 1 length: cache_len - (tmp - cache_c) - 1]; attrPrefix = [[OFString alloc] initWithCString: cache_c length: tmp - cache_c]; } else { attrName = [cache copy]; attrPrefix = nil; } [cache setToCString: ""]; last = i + 1; state = OF_XMLPARSER_EXPECT_DELIM; } |
︙ | ︙ | |||
402 403 404 405 406 407 408 | if (attrs == nil) attrs = [[OFMutableArray alloc] init]; pool = [[OFAutoreleasePool alloc] init]; attr_val = [cache stringByXMLUnescapingWithHandler: self]; [attrs addObject: [OFXMLAttribute | | | | | | | 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 | if (attrs == nil) attrs = [[OFMutableArray alloc] init]; pool = [[OFAutoreleasePool alloc] init]; attr_val = [cache stringByXMLUnescapingWithHandler: self]; [attrs addObject: [OFXMLAttribute attributeWithName: attrName prefix: attrPrefix namespace: nil stringValue: attr_val]]; [pool release]; [cache setToCString: ""]; [attrName release]; [attrPrefix release]; attrName = attrPrefix = nil; last = i + 1; state = OF_XMLPARSER_IN_TAG; } break; /* Expecting closing '>' */ |
︙ | ︙ | |||
508 509 510 511 512 513 514 | size_t i, last; BOOL in_entity; OFMutableString *ret; last = 0; in_entity = NO; ret = [OFMutableString string]; | | | 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 | size_t i, last; BOOL in_entity; OFMutableString *ret; last = 0; in_entity = NO; ret = [OFMutableString string]; ((OFString*)ret)->isUTF8 = isUTF8; for (i = 0; i < length; i++) { if (!in_entity && string[i] == '&') { [ret appendCStringWithoutUTF8Checking: string + last length: i - last]; last = i + 1; |
︙ | ︙ |