aboutsummaryrefslogtreecommitdiffstats
path: root/src/uri.c
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-02-10 21:41:09 +0000
committerDavid Robillard <d@drobilla.net>2011-02-10 21:41:09 +0000
commit7e6fa773dba243e3cf11b98d223f6d417e73aa66 (patch)
treef2eb6ce20fc706ecc5c0849d899c32d373771971 /src/uri.c
parentdccceaf112ac67460532dcced9007462bea3a0de (diff)
downloadserd-7e6fa773dba243e3cf11b98d223f6d417e73aa66.tar.gz
serd-7e6fa773dba243e3cf11b98d223f6d417e73aa66.tar.bz2
serd-7e6fa773dba243e3cf11b98d223f6d417e73aa66.zip
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
Diffstat (limited to 'src/uri.c')
-rw-r--r--src/uri.c7
1 files changed, 3 insertions, 4 deletions
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