| ne_uri.h | ne_uri.h | |||
|---|---|---|---|---|
| skipping to change at line 37 | skipping to change at line 37 | |||
| BEGIN_NEON_DECLS | BEGIN_NEON_DECLS | |||
| /* Un-escapes a path. Returns malloc-allocated path on success, or | /* Un-escapes a path. Returns malloc-allocated path on success, or | |||
| * NULL on an invalid %<HEX><HEX> sequence. */ | * NULL on an invalid %<HEX><HEX> sequence. */ | |||
| char *ne_path_unescape(const char *uri); | char *ne_path_unescape(const char *uri); | |||
| /* Escapes the a path segment: returns malloc-allocated string on | /* Escapes the a path segment: returns malloc-allocated string on | |||
| * success, or NULL on malloc failure. */ | * success, or NULL on malloc failure. */ | |||
| char *ne_path_escape(const char *abs_path); | char *ne_path_escape(const char *abs_path); | |||
| /* Returns parent of path */ | /* Returns malloc-allocated parent of path, or NULL if path has no | |||
| * parent (such as "/"). */ | ||||
| char *ne_path_parent(const char *path); | char *ne_path_parent(const char *path); | |||
| /* Returns strcmp-like value giving comparison between p1 and p2, | /* Returns strcmp-like value giving comparison between p1 and p2, | |||
| * ignoring trailing-slashes. */ | * ignoring trailing-slashes. */ | |||
| int ne_path_compare(const char *p1, const char *p2); | int ne_path_compare(const char *p1, const char *p2); | |||
| /* Returns non-zero if child is a child of parent */ | /* Returns non-zero if child is a child of parent */ | |||
| int ne_path_childof(const char *parent, const char *child); | int ne_path_childof(const char *parent, const char *child); | |||
| /* Returns non-zero if path has a trailing slash character */ | /* Returns non-zero if path has a trailing slash character */ | |||
| skipping to change at line 61 | skipping to change at line 62 | |||
| int ne_uri_defaultport(const char *scheme); | int ne_uri_defaultport(const char *scheme); | |||
| typedef struct { | typedef struct { | |||
| char *scheme; | char *scheme; | |||
| char *host; | char *host; | |||
| int port; | int port; | |||
| char *path; | char *path; | |||
| char *authinfo; | char *authinfo; | |||
| } ne_uri; | } ne_uri; | |||
| /* Parse 'uri' and place parsed segments in *parsed. Returns zero on | /* Parse absoluteURI 'uri' and place parsed segments in *parsed. | |||
| * success, non-zero on parse error. Fields of *parsed are malloc'ed, | * Returns zero on success, non-zero on parse error. Fields of *parsed | |||
| * structure should be free'd with uri_free on successful return. Any | * are malloc'ed, structure should be free'd with uri_free on | |||
| * unspecified URI fields are set to NULL or 0 appropriately in | * successful return. Any unspecified URI fields are set to NULL or 0 | |||
| * *parsed. */ | * appropriately in *parsed. */ | |||
| int ne_uri_parse(const char *uri, ne_uri *parsed); | int ne_uri_parse(const char *uri, ne_uri *parsed); | |||
| /* Turns a URI structure back into a string. String is | /* Turns a URI structure back into a string. String is | |||
| * malloc-allocated, and must be free'd by the caller. */ | * malloc-allocated, and must be free'd by the caller. */ | |||
| char *ne_uri_unparse(const ne_uri *uri); | char *ne_uri_unparse(const ne_uri *uri); | |||
| /* Compares URIs u1 and u2, returns non-zero if they are found to be | /* Compares URIs u1 and u2, returns non-zero if they are found to be | |||
| * non-equal. The sign of the return value is <0 if 'u1' is less than | * non-equal. The sign of the return value is <0 if 'u1' is less than | |||
| * 'u2', or >0 if 'u2' is greater than 'u1'. */ | * 'u2', or >0 if 'u2' is greater than 'u1'. */ | |||
| int ne_uri_cmp(const ne_uri *u1, const ne_uri *u2); | int ne_uri_cmp(const ne_uri *u1, const ne_uri *u2); | |||
| /* Free URI object. */ | ||||
| void ne_uri_free(ne_uri *parsed); | void ne_uri_free(ne_uri *parsed); | |||
| END_NEON_DECLS | END_NEON_DECLS | |||
| #endif /* NE_URI_H */ | #endif /* NE_URI_H */ | |||
| End of changes. 3 change blocks. | ||||
| 6 lines changed or deleted | 8 lines changed or added | |||