mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-24 21:16:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simply return bool from nsurl_compare.

Browse Source 
svn path=/trunk/netsurf/; revision=12889
This commit is contained in:
Michael Drake 2011-09-26 14:57:45 +00:00
parent 212358278c
commit 75d61bca44
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
utils/nsurl.c
View File

@ -923,76 +923,77 @@ void nsurl_unref(nsurl *url)
/* exported interface, documented in nsurl.h */ /* exported interface, documented in nsurl.h */
nserror nsurl_compare(const nsurl *url1, const nsurl *url2, bool nsurl_compare(const nsurl *url1, const nsurl *url2, nsurl_component parts)
nsurl_component parts, bool *match)
{ {
bool match = true;
assert(url1 != NULL); assert(url1 != NULL);
assert(url2 != NULL); assert(url2 != NULL);
*match = true;
/* Compare URL components */ /* Compare URL components */
/* Path, host and query first, since they're most likely to differ */ /* Path, host and query first, since they're most likely to differ */
if (parts & NSURL_PATH) { if (parts & NSURL_PATH) {
nsurl__component_compare(url1->path, url2->path, match); nsurl__component_compare(url1->path, url2->path, &match);
if (*match == false) if (match == false)
return NSERROR_OK; return false;
} }
if (parts & NSURL_HOST) { if (parts & NSURL_HOST) {
nsurl__component_compare(url1->host, url2->host, match); nsurl__component_compare(url1->host, url2->host, &match);
if (*match == false) if (match == false)
return NSERROR_OK; return false;
} }
if (parts & NSURL_QUERY) { if (parts & NSURL_QUERY) {
nsurl__component_compare(url1->query, url2->query, match); nsurl__component_compare(url1->query, url2->query, &match);
if (*match == false) if (match == false)
return NSERROR_OK; return false;
} }
if (parts & NSURL_SCHEME) { if (parts & NSURL_SCHEME) {
nsurl__component_compare(url1->scheme, url2->scheme, match); nsurl__component_compare(url1->scheme, url2->scheme, &match);
if (*match == false) if (match == false)
return NSERROR_OK; return false;
} }
if (parts & NSURL_USERNAME) { if (parts & NSURL_USERNAME) {
nsurl__component_compare(url1->username, url2->username, match); nsurl__component_compare(url1->username, url2->username,
&match);
if (*match == false) if (match == false)
return NSERROR_OK; return false;
} }
if (parts & NSURL_PASSWORD) { if (parts & NSURL_PASSWORD) {
nsurl__component_compare(url1->password, url2->password, match); nsurl__component_compare(url1->password, url2->password,
&match);
if (*match == false) if (match == false)
return NSERROR_OK; return false;
} }
if (parts & NSURL_PORT) { if (parts & NSURL_PORT) {
nsurl__component_compare(url1->port, url2->port, match); nsurl__component_compare(url1->port, url2->port, &match);
if (*match == false) if (match == false)
return NSERROR_OK; return false;
} }
if (parts & NSURL_FRAGMENT) { if (parts & NSURL_FRAGMENT) {
nsurl__component_compare(url1->fragment, url2->fragment, match); nsurl__component_compare(url1->fragment, url2->fragment,
&match);
if (*match == false) if (match == false)
return NSERROR_OK; return false;
} }
*match = true; return true;
return NSERROR_OK;
} }

3
utils/nsurl.h
View File

@ -94,8 +94,7 @@ void nsurl_unref(nsurl *url);
* *
* If return value != NSERROR_OK, match will be false. * If return value != NSERROR_OK, match will be false.
*/ */
nserror nsurl_compare(const nsurl *url1, const nsurl *url2, bool nsurl_compare(const nsurl *url1, const nsurl *url2, nsurl_component parts);
nsurl_component parts, bool *match);
/** /**