diff options
author | Michael Drake <tlsa@netsurf-browser.org> | 2012-10-06 14:11:29 +0100 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2012-10-06 14:11:29 +0100 |
commit | aeac82ff17335a1d8c9c366dfad537f97198da86 (patch) | |
tree | 01272b4086d72b3b08271e343aef0fc1c5ea6559 /utils | |
parent | 639d2cb659756e4c40cfc683ad16b4fc470a3001 (diff) | |
download | netsurf-aeac82ff17335a1d8c9c366dfad537f97198da86.tar.gz netsurf-aeac82ff17335a1d8c9c366dfad537f97198da86.tar.bz2 |
Remove url_parent.
Diffstat (limited to 'utils')
-rw-r--r-- | utils/url.c | 49 | ||||
-rw-r--r-- | utils/url.h | 1 |
2 files changed, 0 insertions, 50 deletions
diff --git a/utils/url.c b/utils/url.c index d0be77bce..84c62882a 100644 --- a/utils/url.c +++ b/utils/url.c @@ -483,55 +483,6 @@ url_func_result url_canonical_root(const char *url, char **result) /** - * Strip the topmost segment of the path - * - * \param url an absolute URL - * \param result pointer to pointer to buffer to hold result - * \return URL_FUNC_OK on success - */ - -url_func_result url_parent(const char *url, char **result) -{ - url_func_result status; - struct url_components components; - int len, path_len; - - assert(url); - - status = url_get_components(url, &components); - if (status == URL_FUNC_OK) { - if ((!components.scheme) || (!components.authority) || - (!components.path)) { - status = URL_FUNC_FAILED; - } else { - if (strcmp(components.path, "/")) { - path_len = strlen(components.path); - if (components.path[path_len - 1] == '/') - path_len--; - while (components.path[path_len - 1] != '/') - path_len--; - } else { - path_len = 1; - } - len = strlen(components.scheme) + - strlen(components.authority) + - path_len + 4; - *result = malloc(len); - if (!(*result)) - status = URL_FUNC_NOMEM; - else - snprintf((*result), len, "%s://%s%s", - components.scheme, - components.authority, - components.path); - } - } - url_destroy_components(&components); - return status; -} - - -/** * Extract path segment from an URL * * \param url an absolute URL diff --git a/utils/url.h b/utils/url.h index e0509ffdb..95790335c 100644 --- a/utils/url.h +++ b/utils/url.h @@ -57,7 +57,6 @@ url_func_result url_escape(const char *unescaped, size_t toskip, bool sptoplus, const char *escexceptions, char **result); url_func_result url_unescape(const char *str, char **result); url_func_result url_canonical_root(const char *url, char **result); -url_func_result url_parent(const char *url, char **result); url_func_result url_path(const char *url, char **result); url_func_result url_compare(const char *url1, const char *url2, bool nofrag, bool *result); |