ObjFW  Diff

Differences From Artifact [f339ad2a58]:

To Artifact [7338b9f854]:

  • File src/OFString.m — part of check-in [526d04018d] at 2009-05-23 21:53:20 on branch trunk — A few renames.

    OFArray:
    * -[add:] to -[addObject:].
    * -[last] to -[lastObject].

    OFAutoreleasePool:
    * +[addToPool:] to +[addObjectToTopmostPool:].
    * -[addToPool:] to -[addObject:].

    OFDataArray:
    * -[add:] to -[addItem:].
    * -[last] to -[lastItem].

    OFObject:
    * -[addToMemoryPool:] to -[addItemToMemoryPool:]. (user: js, size: 7227) [annotate] [blame] [check-ins using]


218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
			free(string);
			c = isa;
			[super dealloc];
			@throw [OFInvalidEncodingException newWithClass: c];
	}

	@try {
		[self addToMemoryPool: string];
	} @catch (OFException *e) {
		free(string);
		@throw e;
	}

	return self;
}







|







218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
			free(string);
			c = isa;
			[super dealloc];
			@throw [OFInvalidEncodingException newWithClass: c];
	}

	@try {
		[self addItemToMemoryPool: string];
	} @catch (OFException *e) {
		free(string);
		@throw e;
	}

	return self;
}
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364

	array = [OFMutableArray array];

	if (delim_len > length) {
		str = [self copy];

		@try {
			[array add: str];
		} @finally {
			[str release];
		}

		[array retain];
		[pool release];








|







350
351
352
353
354
355
356
357
358
359
360
361
362
363
364

	array = [OFMutableArray array];

	if (delim_len > length) {
		str = [self copy];

		@try {
			[array addObject: str];
		} @finally {
			[str release];
		}

		[array retain];
		[pool release];

382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
		tmp[i - last] = '\0';
		@try {
			str = [OFString stringWithCString: tmp];
		} @finally {
			free(tmp);
		}

		[array add: str];
		[array retain];
		[pool releaseObjects];

		i += delim_len - 1;
		last = i + 1;
	}
	[array add: [OFString stringWithCString: string + last]];

	[array retain];
	[pool release];

	return array;
}
@end







|






|







382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
		tmp[i - last] = '\0';
		@try {
			str = [OFString stringWithCString: tmp];
		} @finally {
			free(tmp);
		}

		[array addObject: str];
		[array retain];
		[pool releaseObjects];

		i += delim_len - 1;
		last = i + 1;
	}
	[array addObject: [OFString stringWithCString: string + last]];

	[array retain];
	[pool release];

	return array;
}
@end