Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/02ff3920ce22f4a4120ca... ...commit http://git.netsurf-browser.org/netsurf.git/commit/02ff3920ce22f4a4120cab8... ...tree http://git.netsurf-browser.org/netsurf.git/tree/02ff3920ce22f4a4120cab8ce... The branch, master has been updated via 02ff3920ce22f4a4120cab8cee3a72a244604732 (commit) from ce3d99191842ded7687dc23c3ccb5f5ccc843558 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=02ff3920ce22f4a4120... commit 02ff3920ce22f4a4120cab8cee3a72a244604732 Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; remove unused url_init function diff --git a/desktop/netsurf.c b/desktop/netsurf.c index 328035f..7c7ce9d 100644 --- a/desktop/netsurf.c +++ b/desktop/netsurf.c @@ -217,8 +217,6 @@ nserror netsurf_init(const char *messages, const char *store_path) if (ret != NSERROR_OK) return ret; - url_init(); - setlocale(LC_ALL, "C"); /* initialise the fetchers */ diff --git a/test/urldbtest.c b/test/urldbtest.c index cc657ed..2b7e8a0 100644 --- a/test/urldbtest.c +++ b/test/urldbtest.c @@ -163,7 +163,6 @@ int main(void) char *path_query; corestrings_init(); - url_init(); h = urldb_add_host("127.0.0.1"); if (!h) { diff --git a/utils/url.c b/utils/url.c index 92e956b..b32a734 100644 --- a/utils/url.c +++ b/utils/url.c @@ -32,35 +32,6 @@ #include "utils/url.h" -regex_t url_re, url_up_re; - -/* exported interface documented in utils/url.h */ -nserror url_init(void) -{ - nserror ret; - - /* regex from RFC 2396 */ - ret = regcomp_wrapper(&url_re, "^[[:space:]]*" -#define URL_RE_SCHEME 2 - "(([a-zA-Z][-a-zA-Z0-9+.]*):)?" -#define URL_RE_AUTHORITY 4 - "(//([^/?#[:space:]]*))?" -#define URL_RE_PATH 5 - "([^?#[:space:]]*)" -#define URL_RE_QUERY 7 - "(\\?([^#[:space:]]*))?" -#define URL_RE_FRAGMENT 9 - "(#([^[:space:]]*))?" - "[[:space:]]*$", REG_EXTENDED); - if (ret != NSERROR_OK) { - return ret; - } - - return regcomp_wrapper(&url_up_re, - "/([^/]?|[.][^./]|[^./][.]|[^./][^./]|[^/][^/][^/]+)" - "/[.][.](/|$)", - REG_EXTENDED); -} /* exported interface documented in utils/url.h */ bool url_host_is_ip_address(const char *host) diff --git a/utils/url.h b/utils/url.h index d05ac05..627bb5c 100644 --- a/utils/url.h +++ b/utils/url.h @@ -35,14 +35,6 @@ /** - * Initialise URL routines. - * - * Compiles regular expressions required by the url_ functions. - */ -nserror url_init(void); - - -/** * Check whether a host string is an IP address. * * This call detects IPv4 addresses (all of dotted-quad or subsets, ----------------------------------------------------------------------- Summary of changes: desktop/netsurf.c | 2 -- test/urldbtest.c | 1 - utils/url.c | 29 ----------------------------- utils/url.h | 8 -------- 4 files changed, 40 deletions(-) diff --git a/desktop/netsurf.c b/desktop/netsurf.c index 328035f..7c7ce9d 100644 --- a/desktop/netsurf.c +++ b/desktop/netsurf.c @@ -217,8 +217,6 @@ nserror netsurf_init(const char *messages, const char *store_path) if (ret != NSERROR_OK) return ret; - url_init(); - setlocale(LC_ALL, "C"); /* initialise the fetchers */ diff --git a/test/urldbtest.c b/test/urldbtest.c index cc657ed..2b7e8a0 100644 --- a/test/urldbtest.c +++ b/test/urldbtest.c @@ -163,7 +163,6 @@ int main(void) char *path_query; corestrings_init(); - url_init(); h = urldb_add_host("127.0.0.1"); if (!h) { diff --git a/utils/url.c b/utils/url.c index 92e956b..b32a734 100644 --- a/utils/url.c +++ b/utils/url.c @@ -32,35 +32,6 @@ #include "utils/url.h" -regex_t url_re, url_up_re; - -/* exported interface documented in utils/url.h */ -nserror url_init(void) -{ - nserror ret; - - /* regex from RFC 2396 */ - ret = regcomp_wrapper(&url_re, "^[[:space:]]*" -#define URL_RE_SCHEME 2 - "(([a-zA-Z][-a-zA-Z0-9+.]*):)?" -#define URL_RE_AUTHORITY 4 - "(//([^/?#[:space:]]*))?" -#define URL_RE_PATH 5 - "([^?#[:space:]]*)" -#define URL_RE_QUERY 7 - "(\\?([^#[:space:]]*))?" -#define URL_RE_FRAGMENT 9 - "(#([^[:space:]]*))?" - "[[:space:]]*$", REG_EXTENDED); - if (ret != NSERROR_OK) { - return ret; - } - - return regcomp_wrapper(&url_up_re, - "/([^/]?|[.][^./]|[^./][.]|[^./][^./]|[^/][^/][^/]+)" - "/[.][.](/|$)", - REG_EXTENDED); -} /* exported interface documented in utils/url.h */ bool url_host_is_ip_address(const char *host) diff --git a/utils/url.h b/utils/url.h index d05ac05..627bb5c 100644 --- a/utils/url.h +++ b/utils/url.h @@ -35,14 +35,6 @@ /** - * Initialise URL routines. - * - * Compiles regular expressions required by the url_ functions. - */ -nserror url_init(void); - - -/** * Check whether a host string is an IP address. * * This call detects IPv4 addresses (all of dotted-quad or subsets, -- NetSurf Browser