ObjFW  Diff

Differences From Artifact [0f7a7ffebd]:

To Artifact [6ffe55f0db]:


114
115
116
117
118
119
120


121
122
123
124
125
126
127
128
129











130
131
132
133
134
135
136
137







138
139
140
141



142
143
144
145
146
147
148
149
150
114
115
116
117
118
119
120
121
122









123
124
125
126
127
128
129
130
131
132
133
134







135
136
137
138
139
140
141
142



143
144
145


146
147
148
149
150
151
152







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

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

-
-
-
+
+
+
-
-







		@throw e;
	}

	size = dict->size;
	count = dict->count;

	for (i = 0; i < size; i++) {
		OFObject <OFCopying> *key;

		if (dict->data[i].key != nil) {
			OFObject <OFCopying> *key;

			@try {
				key = [dict->data[i].key copy];
			} @catch (OFException *e) {
				[self dealloc];
				@throw e;
			}
		if (dict->data[i].key == nil) {
			data[i].key = nil;
			continue;
		}

		@try {
			key = [dict->data[i].key copy];
		} @catch (OFException *e) {
			[self dealloc];
			@throw e;
		}

			@try {
				[dict->data[i].object retain];
			} @catch (OFException *e) {
				[key release];
				[self dealloc];
				@throw e;
			}
		@try {
			[dict->data[i].object retain];
		} @catch (OFException *e) {
			[key release];
			[self dealloc];
			@throw e;
		}

			data[i].key = key;
			data[i].object = dict->data[i].object;
			data[i].hash = dict->data[i].hash;
		data[i].key = key;
		data[i].object = dict->data[i].object;
		data[i].hash = dict->data[i].hash;
		} else
			data[i].key = nil;
	}

	return self;
}

- initWithObject: (OFObject*)obj
	  forKey: (OFObject <OFCopying>*)key