From bfe42327cab38b3e47a3b2afec53ea8edd4b1531 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 4 Aug 2020 16:22:16 +0200 Subject: Remove lilv_dir_path() This function was weird. Instead, to make a directory path with trailing separator, join nothing as in Python. --- src/state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/state.c') diff --git a/src/state.c b/src/state.c index 85e8d0f..2b7cde9 100644 --- a/src/state.c +++ b/src/state.c @@ -539,7 +539,7 @@ set_state_dir_from_model(LilvState* state, const SordNode* graph) const char* uri = (const char*)sord_node_get_string(graph); char* path = lilv_file_uri_parse(uri, NULL); - state->dir = lilv_dir_path(path); + state->dir = lilv_path_join(path, NULL); free(path); } assert(!state->dir || lilv_path_is_absolute(state->dir)); @@ -559,7 +559,7 @@ new_state_from_model(LilvWorld* world, // Allocate state LilvState* const state = (LilvState*)calloc(1, sizeof(LilvState)); - state->dir = lilv_dir_path(dir); + state->dir = lilv_path_join(dir, NULL); state->atom_Path = map->map(map->handle, LV2_ATOM__Path); state->uri = lilv_node_new_from_node(world, node); @@ -727,7 +727,7 @@ lilv_state_new_from_file(LilvWorld* world, char* dirname = lilv_path_parent(path); char* real_path = lilv_path_canonical(dirname); - char* dir_path = lilv_dir_path(real_path); + char* dir_path = lilv_path_join(real_path, NULL); LilvState* state = new_state_from_model(world, map, model, subject_node, dir_path); free(dir_path); -- cgit v1.2.1