summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2019-04-01 00:14:47 +0200
committerDavid Robillard <d@drobilla.net>2021-03-24 10:59:21 -0400
commit18ce03173dc8663b3f88c7010693641bad42eac4 (patch)
tree31f39e1e142e01994b0f421a0fc949b1da41f9f4
parentccbc5e1993568a3ef27790ebad27b71f3073ca88 (diff)
downloadlilv-18ce03173dc8663b3f88c7010693641bad42eac4.tar.gz
lilv-18ce03173dc8663b3f88c7010693641bad42eac4.tar.bz2
lilv-18ce03173dc8663b3f88c7010693641bad42eac4.zip
Remove lilv_uri_to_path()
-rw-r--r--include/lilv/lilv.h15
-rw-r--r--include/lilv/lilvmm.hpp7
-rw-r--r--src/util.c15
-rw-r--r--test/test_value.c10
4 files changed, 0 insertions, 47 deletions
diff --git a/include/lilv/lilv.h b/include/lilv/lilv.h
index c557946..1e5f7a0 100644
--- a/include/lilv/lilv.h
+++ b/include/lilv/lilv.h
@@ -105,21 +105,6 @@ lilv_free(void* ptr);
/**
Convert a file URI string to a local path string.
- For example, "file://foo/bar/baz.ttl" returns "/foo/bar/baz.ttl".
- Return value is shared and must not be deleted by caller.
- This function does not handle escaping correctly and should not be used for
- general file URIs. Use lilv_file_uri_parse() instead.
-
- @return `uri` converted to a path, or NULL on failure (URI is not local).
-*/
-LILV_API
-LILV_DEPRECATED
-const char*
-lilv_uri_to_path(const char* uri);
-
-/**
- Convert a file URI string to a local path string.
-
For example, "file://foo/bar%20one/baz.ttl" returns "/foo/bar one/baz.ttl".
Return value must be freed by caller with lilv_free().
diff --git a/include/lilv/lilvmm.hpp b/include/lilv/lilvmm.hpp
index 0ac802d..d447b9d 100644
--- a/include/lilv/lilvmm.hpp
+++ b/include/lilv/lilvmm.hpp
@@ -47,13 +47,6 @@ struct UI;
struct UIs;
struct World;
-LILV_DEPRECATED
-static inline const char*
-uri_to_path(const char* uri)
-{
- return lilv_uri_to_path(uri);
-}
-
#if defined(__clang__)
# pragma clang diagnostic pop
#elif defined(__GNUC__) && __GNUC__ > 4
diff --git a/src/util.c b/src/util.c
index 92f72b9..4575ea2 100644
--- a/src/util.c
+++ b/src/util.c
@@ -87,21 +87,6 @@ lilv_strdup(const char* str)
return copy;
}
-const char*
-lilv_uri_to_path(const char* uri)
-{
-#if defined(__GNUC__) && __GNUC__ > 4
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
- return (const char*)serd_uri_to_path((const uint8_t*)uri);
-
-#if defined(__GNUC__) && __GNUC__ > 4
-# pragma GCC diagnostic pop
-#endif
-}
-
char*
lilv_file_uri_parse(const char* uri, char** hostname)
{
diff --git a/test/test_value.c b/test/test_value.c
index 8061029..b36737a 100644
--- a/test/test_value.c
+++ b/test/test_value.c
@@ -73,16 +73,6 @@ main(void)
assert(isnan(lilv_node_as_float(sval)));
#if defined(__clang__)
-# pragma clang diagnostic push
-# pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(__GNUC__) && __GNUC__ > 4
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
- assert(!strcmp(lilv_uri_to_path("file:///foo"), "/foo"));
-
-#if defined(__clang__)
# pragma clang diagnostic pop
#elif defined(__GNUC__) && __GNUC__ > 4
# pragma GCC diagnostic pop