ObjFW  Diff

Differences From Artifact [d6e6b667b8]:

To Artifact [9667538219]:


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
153
154
155
156
157
158
159
160

161

162
163
164
165
166
167
168
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
153
154
155
156
157
158
159
160
161
162

163
164
165
166
167
168
169
170







-
+


-
+








+
-
+

-
+


-
+











+
-
+







					    length: 1];
			else if (entityLength == 3 &&
			    memcmp(entity, "amp", 3) == 0)
				[ret appendCString: "&"
					  encoding: OF_STRING_ENCODING_ASCII
					    length: 1];
			else if (entity[0] == '#') {
				void *pool;
				void *pool2;
				OFString *tmp;

				pool = objc_autoreleasePoolPush();
				pool2 = objc_autoreleasePoolPush();
				tmp = parseNumericEntity(entity,
				    entityLength);

				if (tmp == nil)
					@throw [OFInvalidFormatException
					    exception];

				[ret appendString: tmp];

				objc_autoreleasePoolPop(pool);
				objc_autoreleasePoolPop(pool2);
			} else {
				void *pool;
				void *pool2;
				OFString *name, *tmp;

				pool = objc_autoreleasePoolPush();
				pool2 = objc_autoreleasePoolPush();

				name = [OFString
				    stringWithUTF8String: entity
						  length: entityLength];
				tmp = lookup(context, self, name);

				if (tmp == nil)
					@throw [OFUnknownXMLEntityException
					    exceptionWithEntityName: name];

				[ret appendString: tmp];

				objc_autoreleasePoolPop(pool);
				objc_autoreleasePoolPop(pool2);
			}

			last = i + 1;
			inEntity = false;
		}
	}