From 096bd47ab0018e7b9c3affd58b6134463e2aaa65 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 8 May 2014 00:16:50 +0100 Subject: refactor url utility functions to use standard nserror codes and have appropriate documentation. --- desktop/download.c | 2 +- desktop/searchweb.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'desktop') diff --git a/desktop/download.c b/desktop/download.c index b458f577c..cad04779f 100644 --- a/desktop/download.c +++ b/desktop/download.c @@ -75,7 +75,7 @@ static char *download_default_filename(const char *url) { char *nice; - if (url_nice(url, &nice, false) == URL_FUNC_OK) + if (url_nice(url, &nice, false) == NSERROR_OK) return nice; return NULL; diff --git a/desktop/searchweb.c b/desktop/searchweb.c index 368ad051a..71c872b75 100644 --- a/desktop/searchweb.c +++ b/desktop/searchweb.c @@ -63,7 +63,7 @@ bool search_web_new_window(struct browser_window *bw, const char *searchterm) nsurl *url; nserror error; - if (url_escape(searchterm,0, true, NULL, &encsearchterm) != URL_FUNC_OK) + if (url_escape(searchterm,0, true, NULL, &encsearchterm) != NSERROR_OK) return false; urltxt = search_web_get_url(encsearchterm); @@ -146,8 +146,7 @@ void search_web_provider_details(int reference) char *search_web_from_term(const char *searchterm) { char *encsearchterm, *url; - if (url_escape(searchterm, 0, true, NULL, &encsearchterm) - != URL_FUNC_OK) + if (url_escape(searchterm, 0, true, NULL, &encsearchterm) != NSERROR_OK) return strdup(searchterm); url = search_web_get_url(encsearchterm); free(encsearchterm); -- cgit v1.2.3