diff options
author | David Robillard <d@drobilla.net> | 2018-06-13 21:32:11 -0400 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2018-12-31 11:37:48 -0500 |
commit | feb16bc18d586080e979845374f053075e6bb7ed (patch) | |
tree | b4e87632c7689798635ae37a9bd097987a7019dd /serd | |
parent | b6197eb59799c2933bd776ea22760fea5e97b4bd (diff) | |
download | serd-feb16bc18d586080e979845374f053075e6bb7ed.tar.gz serd-feb16bc18d586080e979845374f053075e6bb7ed.tar.bz2 serd-feb16bc18d586080e979845374f053075e6bb7ed.zip |
Simplify SerdEnv API
Diffstat (limited to 'serd')
-rw-r--r-- | serd/serd.h | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/serd/serd.h b/serd/serd.h index 18a95b20..3d6b046d 100644 --- a/serd/serd.h +++ b/serd/serd.h @@ -881,17 +881,14 @@ serd_env_get_base_uri(const SerdEnv* env); */ SERD_API SerdStatus -serd_env_set_base_uri(SerdEnv* env, - const SerdNode* uri); +serd_env_set_base_uri(SerdEnv* env, const SerdNode* uri); /** Set a namespace prefix. */ SERD_API SerdStatus -serd_env_set_prefix(SerdEnv* env, - const SerdNode* name, - const SerdNode* uri); +serd_env_set_prefix(SerdEnv* env, const SerdNode* name, const SerdNode* uri); /** Set a namespace prefix. @@ -904,26 +901,12 @@ serd_env_set_prefix_from_strings(SerdEnv* env, /** Qualify `uri` into a CURIE if possible. -*/ -SERD_API -bool -serd_env_qualify(const SerdEnv* env, - const SerdNode* uri, - const SerdNode** prefix, - SerdSlice* suffix); -/** - Expand `curie`. - - Errors: SERD_ERR_BAD_ARG if `curie` is not valid, or SERD_ERR_BAD_CURIE if - prefix is not defined in `env`. + Returns null if `node` can not be qualified. */ SERD_API -SerdStatus -serd_env_expand(const SerdEnv* env, - const SerdNode* curie, - SerdSlice* uri_prefix, - SerdSlice* uri_suffix); +SerdNode* +serd_env_qualify(const SerdEnv* env, const SerdNode* uri); /** Expand `node`, which must be a CURIE or URI, to a full URI. @@ -932,8 +915,7 @@ serd_env_expand(const SerdEnv* env, */ SERD_API SerdNode* -serd_env_expand_node(const SerdEnv* env, - const SerdNode* node); +serd_env_expand(const SerdEnv* env, const SerdNode* node); /** Call `func` for each prefix defined in `env`. |