ObjFW  Check-in [d7269ab32a]

Overview
Comment:OFURL: Require files for fileSystemRepresentation
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: d7269ab32ab3b6991f567f0ebf3eb8b8b2a475716ec7076187cbb16a81238c61
User & Date: js on 2018-04-15 13:34:10
Other Links: manifest | tags
Context
2018-04-15
14:18
Disable shared libraries and threads on AmigaOS 4 check-in: 9b75d1994c user: js tags: trunk
13:34
OFURL: Require files for fileSystemRepresentation check-in: d7269ab32a user: js tags: trunk
13:01
OFValueTests: Make signedness of char explicit check-in: 5edba36213 user: js tags: trunk
Changes

Modified src/OFURL.h from [fe71aaca70] to [34af006a63].

138
139
140
141
142
143
144

145
146
147
148
149
150
151
152
153

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







+









+







    OFString *URLEncodedFragment;

/*!
 * @brief The URL as a string.
 */
@property (readonly, nonatomic) OFString *string;

#ifdef OF_HAVE_FILES
/*!
 * @brief The local file system representation for a file URL.
 *
 * @note This only exists for URLs with the file scheme and throws an exception
 *	 otherwise.
 *
 */
@property OF_NULLABLE_PROPERTY (readonly, nonatomic)
    OFString *fileSystemRepresentation;
#endif

/*!
 * @brief Creates a new URL with the specified string.
 *
 * @param string A string describing a URL
 * @return A new, autoreleased OFURL
 */

Modified src/OFURL.m from [a226263679] to [543fd659f7].

1014
1015
1016
1017
1018
1019
1020

1021
1022
1023
1024
1025
1026
1027
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028







+







		[ret appendFormat: @"#%@", _URLEncodedFragment];

	[ret makeImmutable];

	return ret;
}

#ifdef OF_HAVE_FILES
- (OFString *)fileSystemRepresentation
{
	void *pool = objc_autoreleasePoolPush();
	OFString *path;

	if (![_URLEncodedScheme isEqual: @"file"])
		@throw [OFInvalidArgumentException exception];
1039
1040
1041
1042
1043
1044
1045

1046
1047
1048
1049
1050
1051
1052
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054







+








	[path retain];

	objc_autoreleasePoolPop(pool);

	return [path autorelease];
}
#endif

- (OFMutableURL *)of_URLByAppendingPathComponent: (OFString *)component
{
	OFMutableURL *ret = [[self mutableCopy] autorelease];
	void *pool;
	OFMutableString *URLEncodedPath;