ObjFW  Diff

Differences From Artifact [84358f6373]:

• File src/OFDictionary.m — part of check-in [94ea6848a8] at 2009-05-24 18:04:09 on branch trunk — Always use #include "config.h" instead of #import "config.h". (user: js, size: 6728) [annotate] [blame] [check-ins using]

To Artifact [2b0ed74966]:

• File src/OFDictionary.m — part of check-in [033054ad75] at 2009-05-29 19:21:57 on branch trunk — A few renames.

  OFExceptions:
  * OFNoMemException to OFOutOfMemoryException.
  * OFMemNotPartOfObjException to OFMemoryNotPartOfObjectException.

  OFObject:
  * -[addItemToMemoryPool:] to -[addMemoryToPool:].
  * -[allocWithSize:] to -[allocMemoryWithSize:].
  * -[allocNItems:withSize] to -[allocMemoryForNItems:withSize:].
  * -[resizeMem:toSize] to -[resizeMemory:toSize:].
  * -[resizeMem:toNItems:withSize:] to
  -[resizeMemoryToNItems:withSize:].
  * -[freeMem] to -[freeMemory:].

  OFString:
  * -[urlencode] to -[urlEncodedString].
  * -[urldecode] to -[urlDecodedString]. (user: js, size: 6750) [annotate] [blame] [check-ins using]

64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79

- init
{
	self = [super init];

	size = 4096;

	@try {
		data = [self allocNItems: size
				withSize: sizeof(OFList*)];
	} @catch (OFException *e) {
		/*
		 * We can't use [super dealloc] on OS X here. Compiler bug?
		 * Anyway, set size to 0 so that [self dealloc] works.
		 */
		size = 0;
		[self dealloc];

|
|

64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79

- init
{
	self = [super init];

	size = 4096;

	@try {
		data = [self allocMemoryForNItems: size
					 withSize: sizeof(OFList*)];
	} @catch (OFException *e) {
		/*
		 * We can't use [super dealloc] on OS X here. Compiler bug?
		 * Anyway, set size to 0 so that [self dealloc] works.
		 */
		size = 0;
		[self dealloc];

94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109

		@throw [OFInvalidArgumentException newWithClass: c
						    andSelector: _cmd];
	}

	size = (size_t)1 << hashsize;

	@try {
		data = [self allocNItems: size
				withSize: sizeof(OFList*)];
	} @catch (OFException *e) {
		/*
		 * We can't use [super dealloc] on OS X here. Compiler bug?
		 * Anyway, set size to 0 so that [self dealloc] works.
		 */
		size = 0;
		[self dealloc];

|
|

94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109

		@throw [OFInvalidArgumentException newWithClass: c
						    andSelector: _cmd];
	}

	size = (size_t)1 << hashsize;

	@try {
		data = [self allocMemoryForNItems: size
					 withSize: sizeof(OFList*)];
	} @catch (OFException *e) {
		/*
		 * We can't use [super dealloc] on OS X here. Compiler bug?
		 * Anyway, set size to 0 so that [self dealloc] works.
		 */
		size = 0;
		[self dealloc];