ObjFW  Diff

Differences From Artifact [6f7f003a8d]:

To Artifact [4145f33ae0]:


205
206
207
208
209
210
211
212
213


214
215
216
217
218

219
220

221
222
223


224
225
226
227
228
229
230
231
232
205
206
207
208
209
210
211


212
213
214
215
216
217

218
219

220



221
222


223
224
225
226
227
228
229







-
-
+
+




-
+

-
+
-
-
-
+
+
-
-







		if ([pair->_key isEqual: key])
			return [[pair->_value copy] autorelease];
	}

	return defaultValue;
}

- (intmax_t)integerForKey: (OFString *)key
	     defaultValue: (intmax_t)defaultValue
- (long long)integerForKey: (OFString *)key
	      defaultValue: (long long)defaultValue
{
	void *pool = objc_autoreleasePoolPush();
	OFString *value = [self stringForKey: key
				defaultValue: nil];
	intmax_t ret;
	long long ret;

	if (value != nil) {
	if (value != nil)
		if ([value hasPrefix: @"0x"] || [value hasPrefix: @"$"])
			ret = value.hexadecimalValue;
		else
		ret = [value longLongValueWithBase: 0];
	else
			ret = value.decimalValue;
	} else
		ret = defaultValue;

	objc_autoreleasePoolPop(pool);

	return ret;
}

350
351
352
353
354
355
356
357

358
359
360
361
362

363
364
365
366
367
368
369
347
348
349
350
351
352
353

354
355
356
357
358

359
360
361
362
363
364
365
366







-
+




-
+








		@throw e;
	}

	objc_autoreleasePoolPop(pool);
}

- (void)setInteger: (intmax_t)integer
- (void)setInteger: (long long)integer
	    forKey: (OFString *)key
{
	void *pool = objc_autoreleasePoolPush();

	[self setString: [OFString stringWithFormat: @"%jd", integer]
	[self setString: [OFString stringWithFormat: @"%lld", integer]
		 forKey: key];

	objc_autoreleasePoolPop(pool);
}

- (void)setBool: (bool)bool_
	 forKey: (OFString *)key