From 7e6fa773dba243e3cf11b98d223f6d417e73aa66 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 10 Feb 2011 21:41:09 +0000 Subject: Make serd_uri_resolve return void, since it has no error case anyway. git-svn-id: http://svn.drobilla.net/serd/trunk@96 490d8e77-9747-427b-9fa3-0b8f29cee8a0 --- src/uri.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/uri.c') diff --git a/src/uri.c b/src/uri.c index c7f345a4..338ef6b6 100644 --- a/src/uri.c +++ b/src/uri.c @@ -186,7 +186,7 @@ end: } SERD_API -bool +void serd_uri_resolve(const SerdURI* r, const SerdURI* base, SerdURI* t) { // See http://tools.ietf.org/html/rfc3986#section-5.2.2 @@ -217,9 +217,9 @@ serd_uri_resolve(const SerdURI* r, const SerdURI* base, SerdURI* t) } t->authority = base->authority; } - t->scheme = base->scheme; + t->scheme = base->scheme; + t->fragment = r->fragment; } - t->fragment = r->fragment; #ifdef URI_DEBUG fprintf(stderr, "RESOLVE URI\nBASE:\n"); @@ -230,7 +230,6 @@ serd_uri_resolve(const SerdURI* r, const SerdURI* base, SerdURI* t) serd_uri_dump(t, stderr); fprintf(stderr, "\n"); #endif - return true; } SERD_API -- cgit v1.2.1