ObjFW  Diff

Differences From Artifact [118e27647e]:

• File src/OFData.m — part of check-in [a06354b42a] at 2017-10-22 15:05:39 on branch trunk — Make Apple GCC with -Wshadow happy (user: js, size: 12368) [annotate] [blame] [check-ins using]

To Artifact [878145eec0]:

• File src/OFData.m — part of check-in [b83d1414b1] at 2017-10-29 00:41:52 on branch trunk — Fix conversion between URL and path on Win32

  This also adds -[OFURL fileSystemRepresentation] to correctly convert a
  URL back to a path in the local file system. (user: js, size: 12394) [annotate] [blame] [check-ins using]

240
241
242
243
244
245
246
247

248
249
250
251
252
253
254

	pool = objc_autoreleasePoolPush();

	scheme = [URL scheme];

# ifdef OF_HAVE_FILES
	if ([scheme isEqual: @"file"])
		self = [self initWithContentsOfFile: [URL path]];

	else
# endif
		@throw [OFUnsupportedProtocolException exceptionWithURL: URL];

	objc_autoreleasePoolPop(pool);

	return self;

|
>

240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255

	pool = objc_autoreleasePoolPush();

	scheme = [URL scheme];

# ifdef OF_HAVE_FILES
	if ([scheme isEqual: @"file"])
		self = [self initWithContentsOfFile:
		    [URL fileSystemRepresentation]];
	else
# endif
		@throw [OFUnsupportedProtocolException exceptionWithURL: URL];

	objc_autoreleasePoolPop(pool);

	return self;