diff options
Diffstat (limited to 'src/collections.c')
| -rw-r--r-- | src/collections.c | 166 |
1 files changed, 82 insertions, 84 deletions
diff --git a/src/collections.c b/src/collections.c index 8a25eaa..6cfb986 100644 --- a/src/collections.c +++ b/src/collections.c @@ -28,15 +28,15 @@ int lilv_ptr_cmp(const void* a, const void* b, void* user_data) { - return (intptr_t)a - (intptr_t)b; + return (intptr_t)a - (intptr_t)b; } int lilv_resource_node_cmp(const void* a, const void* b, void* user_data) { - const SordNode* an = ((const LilvNode*)a)->node; - const SordNode* bn = ((const LilvNode*)b)->node; - return (intptr_t)an - (intptr_t)bn; + const SordNode* an = ((const LilvNode*)a)->node; + const SordNode* bn = ((const LilvNode*)b)->node; + return (intptr_t)an - (intptr_t)bn; } /* Generic collection functions */ @@ -44,34 +44,33 @@ lilv_resource_node_cmp(const void* a, const void* b, void* user_data) static inline LilvCollection* lilv_collection_new(ZixComparator cmp, ZixDestroyFunc destructor) { - return zix_tree_new(false, cmp, NULL, destructor); + return zix_tree_new(false, cmp, NULL, destructor); } void lilv_collection_free(LilvCollection* collection) { - if (collection) { - zix_tree_free((ZixTree*)collection); - } + if (collection) { + zix_tree_free((ZixTree*)collection); + } } unsigned lilv_collection_size(const LilvCollection* collection) { - return (collection ? zix_tree_size((const ZixTree*)collection) : 0); + return (collection ? zix_tree_size((const ZixTree*)collection) : 0); } LilvIter* lilv_collection_begin(const LilvCollection* collection) { - return collection ? (LilvIter*)zix_tree_begin((ZixTree*)collection) : NULL; + return collection ? (LilvIter*)zix_tree_begin((ZixTree*)collection) : NULL; } void* -lilv_collection_get(const LilvCollection* collection, - const LilvIter* i) +lilv_collection_get(const LilvCollection* collection, const LilvIter* i) { - return zix_tree_get((const ZixTreeIter*)i); + return zix_tree_get((const ZixTreeIter*)i); } /* Constructors */ @@ -79,29 +78,28 @@ lilv_collection_get(const LilvCollection* collection, LilvScalePoints* lilv_scale_points_new(void) { - return lilv_collection_new(lilv_ptr_cmp, - (ZixDestroyFunc)lilv_scale_point_free); + return lilv_collection_new(lilv_ptr_cmp, + (ZixDestroyFunc)lilv_scale_point_free); } LilvNodes* lilv_nodes_new(void) { - return lilv_collection_new(lilv_ptr_cmp, - (ZixDestroyFunc)lilv_node_free); + return lilv_collection_new(lilv_ptr_cmp, (ZixDestroyFunc)lilv_node_free); } LilvUIs* lilv_uis_new(void) { - return lilv_collection_new(lilv_header_compare_by_uri, - (ZixDestroyFunc)lilv_ui_free); + return lilv_collection_new(lilv_header_compare_by_uri, + (ZixDestroyFunc)lilv_ui_free); } LilvPluginClasses* lilv_plugin_classes_new(void) { - return lilv_collection_new(lilv_header_compare_by_uri, - (ZixDestroyFunc)lilv_plugin_class_free); + return lilv_collection_new(lilv_header_compare_by_uri, + (ZixDestroyFunc)lilv_plugin_class_free); } /* URI based accessors (for collections of things with URIs) */ @@ -110,14 +108,14 @@ const LilvPluginClass* lilv_plugin_classes_get_by_uri(const LilvPluginClasses* classes, const LilvNode* uri) { - return (LilvPluginClass*)lilv_collection_get_by_uri( - (const ZixTree*)classes, uri); + return (LilvPluginClass*)lilv_collection_get_by_uri((const ZixTree*)classes, + uri); } const LilvUI* lilv_uis_get_by_uri(const LilvUIs* uis, const LilvNode* uri) { - return (LilvUI*)lilv_collection_get_by_uri((const ZixTree*)uis, uri); + return (LilvUI*)lilv_collection_get_by_uri((const ZixTree*)uis, uri); } /* Plugins */ @@ -125,14 +123,13 @@ lilv_uis_get_by_uri(const LilvUIs* uis, const LilvNode* uri) LilvPlugins* lilv_plugins_new(void) { - return lilv_collection_new(lilv_header_compare_by_uri, NULL); + return lilv_collection_new(lilv_header_compare_by_uri, NULL); } const LilvPlugin* lilv_plugins_get_by_uri(const LilvPlugins* plugins, const LilvNode* uri) { - return (LilvPlugin*)lilv_collection_get_by_uri( - (const ZixTree*)plugins, uri); + return (LilvPlugin*)lilv_collection_get_by_uri((const ZixTree*)plugins, uri); } /* Nodes */ @@ -140,65 +137,61 @@ lilv_plugins_get_by_uri(const LilvPlugins* plugins, const LilvNode* uri) bool lilv_nodes_contains(const LilvNodes* nodes, const LilvNode* value) { - LILV_FOREACH(nodes, i, nodes) { - if (lilv_node_equals(lilv_nodes_get(nodes, i), value)) { - return true; - } - } + LILV_FOREACH (nodes, i, nodes) { + if (lilv_node_equals(lilv_nodes_get(nodes, i), value)) { + return true; + } + } - return false; + return false; } LilvNodes* lilv_nodes_merge(const LilvNodes* a, const LilvNodes* b) { - LilvNodes* result = lilv_nodes_new(); + LilvNodes* result = lilv_nodes_new(); - LILV_FOREACH(nodes, i, a) - zix_tree_insert((ZixTree*)result, - lilv_node_duplicate(lilv_nodes_get(a, i)), - NULL); + LILV_FOREACH (nodes, i, a) { + zix_tree_insert( + (ZixTree*)result, lilv_node_duplicate(lilv_nodes_get(a, i)), NULL); + } - LILV_FOREACH(nodes, i, b) - zix_tree_insert((ZixTree*)result, - lilv_node_duplicate(lilv_nodes_get(b, i)), - NULL); + LILV_FOREACH (nodes, i, b) { + zix_tree_insert( + (ZixTree*)result, lilv_node_duplicate(lilv_nodes_get(b, i)), NULL); + } - return result; + return result; } /* Iterator */ -#define LILV_COLLECTION_IMPL(prefix, CT, ET) \ -\ -unsigned \ -prefix##_size(const CT* collection) { \ - return lilv_collection_size(collection); \ -} \ -\ -\ -LilvIter* \ -prefix##_begin(const CT* collection) { \ - return lilv_collection_begin(collection); \ -} \ -\ -\ -const ET* \ -prefix##_get(const CT* collection, LilvIter* i) { \ - return (ET*)lilv_collection_get(collection, i); \ -} \ -\ -\ -LilvIter* \ -prefix##_next(const CT* collection, LilvIter* i) { \ - return zix_tree_iter_next((ZixTreeIter*)i); \ -} \ -\ -\ -bool \ -prefix##_is_end(const CT* collection, LilvIter* i) { \ - return zix_tree_iter_is_end((ZixTreeIter*)i); \ -} +#define LILV_COLLECTION_IMPL(prefix, CT, ET) \ + \ + unsigned prefix##_size(const CT* collection) \ + { \ + return lilv_collection_size(collection); \ + } \ + \ + LilvIter* prefix##_begin(const CT* collection) \ + { \ + return lilv_collection_begin(collection); \ + } \ + \ + const ET* prefix##_get(const CT* collection, LilvIter* i) \ + { \ + return (ET*)lilv_collection_get(collection, i); \ + } \ + \ + LilvIter* prefix##_next(const CT* collection, LilvIter* i) \ + { \ + return zix_tree_iter_next((ZixTreeIter*)i); \ + } \ + \ + bool prefix##_is_end(const CT* collection, LilvIter* i) \ + { \ + return zix_tree_iter_is_end((ZixTreeIter*)i); \ + } LILV_COLLECTION_IMPL(lilv_plugin_classes, LilvPluginClasses, LilvPluginClass) LILV_COLLECTION_IMPL(lilv_scale_points, LilvScalePoints, LilvScalePoint) @@ -207,27 +200,32 @@ LILV_COLLECTION_IMPL(lilv_nodes, LilvNodes, LilvNode) LILV_COLLECTION_IMPL(lilv_plugins, LilvPlugins, LilvPlugin) void -lilv_plugin_classes_free(LilvPluginClasses* collection) { - lilv_collection_free(collection); +lilv_plugin_classes_free(LilvPluginClasses* collection) +{ + lilv_collection_free(collection); } void -lilv_scale_points_free(LilvScalePoints* collection) { - lilv_collection_free(collection); +lilv_scale_points_free(LilvScalePoints* collection) +{ + lilv_collection_free(collection); } void -lilv_uis_free(LilvUIs* collection) { - lilv_collection_free(collection); +lilv_uis_free(LilvUIs* collection) +{ + lilv_collection_free(collection); } void -lilv_nodes_free(LilvNodes* collection) { - lilv_collection_free(collection); +lilv_nodes_free(LilvNodes* collection) +{ + lilv_collection_free(collection); } LilvNode* -lilv_nodes_get_first(const LilvNodes* collection) { - return (LilvNode*)lilv_collection_get(collection, - lilv_collection_begin(collection)); +lilv_nodes_get_first(const LilvNodes* collection) +{ + return (LilvNode*)lilv_collection_get(collection, + lilv_collection_begin(collection)); } |