ObjFW  Check-in [ea2533ca8e]

Overview
Comment:Ensure we have an OFMutableString in -[OFArray description].
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: ea2533ca8eebf7d1aa5bb1b830be22b17752820c73f2a802f78c742d4d929b96
User & Date: js on 2010-11-17 13:05:46
Other Links: manifest | tags
Context
2010-11-17
16:06
Remove strlen in -[appendCStringWithoutUTF8Checking:length:]. check-in: e6c5c90751 user: js tags: trunk
13:05
Ensure we have an OFMutableString in -[OFArray description]. check-in: ea2533ca8e user: js tags: trunk
12:59
Always return the description in -[componentsJoinedByString]. check-in: eeb744ac25 user: js tags: trunk
Changes

Modified src/OFArray.m from [638078253b] to [a01dde889d].

354
355
356
357
358
359
360

361
362
363
364
365
366
367












368
369
370
371
372
373
374
354
355
356
357
358
359
360
361
362
363





364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382







+


-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+







	OF_HASH_FINALIZE(hash);

	return hash;
}

- (OFString*)description
{
	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
	OFMutableString *ret;

	ret = (OFMutableString*)[self componentsJoinedByString: @", "];
	[ret prependString: @"("];
	[ret appendString: @")"];

	return ret;
	ret = [[self componentsJoinedByString: @", "] mutableCopy];

	@try {
		[ret prependString: @"("];
		[ret appendString: @")"];
	} @catch (id e) {
		[ret release];
	}

	[pool release];

	return [ret autorelease];
}

- (int)countByEnumeratingWithState: (of_fast_enumeration_state_t*)state
			   objects: (id*)objects
			     count: (int)count_
{
	size_t count = [array count];