ObjFW  Diff

Differences From Artifact [8e156f58b1]:

To Artifact [4f2aa36df7]:


185
186
187
188
189
190
191
192

193
194
195
196
197
198
199
200
185
186
187
188
189
190
191

192

193
194
195
196
197
198
199







-
+
-







 * @brief Creates a new URL with the specified string relative to the
 *	  specified URL.
 *
 * @param string A string describing a URL
 * @param URL An URL to which the string is relative
 * @return A new, autoreleased OFURL
 */
+ (instancetype)URLWithString: (OFString *)string
+ (instancetype)URLWithString: (OFString *)string relativeToURL: (OFURL *)URL;
		relativeToURL: (OFURL *)URL;

#ifdef OF_HAVE_FILES
/**
 * @brief Creates a new URL with the specified local file path.
 *
 * If a directory exists at the specified path, a slash is appended if there is
 * no slash yet.
228
229
230
231
232
233
234
235

236
237
238
239
240
241
242
243
227
228
229
230
231
232
233

234

235
236
237
238
239
240
241







-
+
-







 * @brief Initializes an already allocated OFURL with the specified string and
 *	  relative URL.
 *
 * @param string A string describing a URL
 * @param URL A URL to which the string is relative
 * @return An initialized OFURL
 */
- (instancetype)initWithString: (OFString *)string
- (instancetype)initWithString: (OFString *)string relativeToURL: (OFURL *)URL;
		 relativeToURL: (OFURL *)URL;

#ifdef OF_HAVE_FILES
/**
 * @brief Initializes an already allocated OFURL with the specified local file
 *	  path.
 *
 * If a directory exists at the specified path, a slash is appended if there is
365
366
367
368
369
370
371
372


373
374
375
376
377
378
379
363
364
365
366
367
368
369

370
371
372
373
374
375
376
377
378







-
+
+







 */
+ (OFCharacterSet *)URLFragmentAllowedCharacterSet;
@end

#ifdef __cplusplus
extern "C" {
#endif
extern bool of_url_is_ipv6_host(OFString *host);
extern bool OFURLIsIPv6Host(OFString *host);
extern void OFURLVerifyIsEscaped(OFString *, OFCharacterSet *);
#ifdef __cplusplus
}
#endif

OF_ASSUME_NONNULL_END

#import "OFMutableURL.h"