From 01f421611c155b1101769eab4122842184645c40 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Fri, 5 Oct 2012 17:29:19 +0100 Subject: Remove unused functions. --- utils/url.c | 110 ------------------------------------------------------------ utils/url.h | 3 -- 2 files changed, 113 deletions(-) (limited to 'utils') diff --git a/utils/url.c b/utils/url.c index a44bd8f3e..d0be77bce 100644 --- a/utils/url.c +++ b/utils/url.c @@ -531,45 +531,6 @@ url_func_result url_parent(const char *url, char **result) } -/** - * Extract path, leafname and query segments from an URL - * - * \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_plq(const char *url, char **result) -{ - url_func_result status; - struct url_components components; - - assert(url); - - status = url_get_components(url, &components); - if (status == URL_FUNC_OK) { - if (!components.path) { - status = URL_FUNC_FAILED; - } else if ((components.query) && - (strlen(components.query) > 0)) { - *result = malloc(strlen(components.path) + - strlen(components.query) + 2); - if (!(*result)) - status = URL_FUNC_NOMEM; - else - sprintf((*result), "%s?%s", components.path, - components.query); - } else { - *result = strdup(components.path); - if (!(*result)) - status = URL_FUNC_NOMEM; - } - } - url_destroy_components(&components); - return status; -} - - /** * Extract path segment from an URL * @@ -599,77 +560,6 @@ url_func_result url_path(const char *url, char **result) return status; } -/** - * Extract leafname from an URL - * - * \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_leafname(const char *url, char **result) -{ - url_func_result status; - struct url_components components; - - assert(url); - - status = url_get_components(url, &components); - if (status == URL_FUNC_OK) { - if (!components.path) { - status = URL_FUNC_FAILED; - } else { - char *slash = strrchr(components.path, '/'); - - assert (slash != NULL); - - *result = strdup(slash + 1); - if (!(*result)) - status = URL_FUNC_NOMEM; - } - } - url_destroy_components(&components); - return status; -} - -/** - * Extract fragment from an URL - * This will unescape any %xx entities in the fragment - * - * \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_fragment(const char *url, char **result) -{ - url_func_result status; - struct url_components components; - - assert(url); - - status = url_get_components(url, &components); - if (status == URL_FUNC_OK) { - if (!components.fragment) { - status = URL_FUNC_FAILED; - } else { - char *frag = curl_unescape(components.fragment, - strlen(components.fragment)); - if (!frag) { - status = URL_FUNC_NOMEM; - } else { - *result = strdup(frag); - if (!(*result)) - status = URL_FUNC_NOMEM; - curl_free(frag); - } - } - } - - url_destroy_components(&components); - return status; -} - /** * Attempt to find a nice filename for a URL. * diff --git a/utils/url.h b/utils/url.h index fa5c67faa..e0509ffdb 100644 --- a/utils/url.h +++ b/utils/url.h @@ -58,10 +58,7 @@ url_func_result url_escape(const char *unescaped, size_t toskip, 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_plq(const char *url, char **result); url_func_result url_path(const char *url, char **result); -url_func_result url_leafname(const char *url, char **result); -url_func_result url_fragment(const char *url, char **result); url_func_result url_compare(const char *url1, const char *url2, bool nofrag, bool *result); -- cgit v1.2.3