diff options
| author | David Robillard <d@drobilla.net> | 2011-02-04 01:56:52 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-02-04 01:56:52 +0000 |
| commit | 5467699b799690f3b4f98a78c316668b6871b935 (patch) | |
| tree | b00b4894ea4ef2558512e78a43e1dfa973422c61 /src/plugin.c | |
| parent | 4f3316c9c7842c4c745291b6699afaade6b8531d (diff) | |
| download | lilv-5467699b799690f3b4f98a78c316668b6871b935.tar.gz lilv-5467699b799690f3b4f98a78c316668b6871b935.tar.bz2 lilv-5467699b799690f3b4f98a78c316668b6871b935.zip | |
Tidy up code.
git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@2899 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/plugin.c')
| -rw-r--r-- | src/plugin.c | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/src/plugin.c b/src/plugin.c index 3ea7b9d..544a5eb 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -646,13 +646,12 @@ slv2_plugin_has_feature(SLV2Plugin p, SLV2Values slv2_plugin_get_supported_features(SLV2Plugin p) { - SLV2Values optional = slv2_plugin_get_optional_features(p); - SLV2Values required = slv2_plugin_get_required_features(p); - - SLV2Values result = slv2_values_new(); - unsigned n_optional = slv2_values_size(optional); - unsigned n_required = slv2_values_size(required); - unsigned i = 0; + SLV2Values optional = slv2_plugin_get_optional_features(p); + SLV2Values required = slv2_plugin_get_required_features(p); + SLV2Values result = slv2_values_new(); + unsigned n_optional = slv2_values_size(optional); + unsigned n_required = slv2_values_size(required); + unsigned i = 0; for ( ; i < n_optional; ++i) slv2_values_set_at(result, i, raptor_sequence_pop(optional)); for ( ; i < n_optional + n_required; ++i) @@ -772,6 +771,9 @@ slv2_plugin_get_uis(SLV2Plugin p) SLV2Node ui_ui = sord_get_uri( p->world->model, true, NS_UI "ui"); + SLV2Node ui_binary_node = sord_get_uri( + p->world->model, true, NS_UI "binary"); + SLV2UIs result = slv2_uis_new(); SLV2Matches uis = slv2_plugin_find_statements( p, @@ -780,18 +782,9 @@ slv2_plugin_get_uis(SLV2Plugin p) NULL); FOREACH_MATCH(uis) { - SLV2Node ui = slv2_match_object(uis); - - SLV2Value type = slv2_plugin_get_unique( - p, ui, p->world->rdf_a_node); - - SLV2Node ui_binary_node = sord_get_uri( - p->world->model, true, NS_UI "binary"); - - SLV2Value binary = slv2_plugin_get_unique( - p, ui, ui_binary_node); - - slv2_node_free(ui_binary_node); + SLV2Node ui = slv2_match_object(uis); + SLV2Value type = slv2_plugin_get_unique(p, ui, p->world->rdf_a_node); + SLV2Value binary = slv2_plugin_get_unique(p, ui, ui_binary_node); if (sord_node_get_type(ui) != SORD_URI || !slv2_value_is_uri(type) @@ -812,6 +805,7 @@ slv2_plugin_get_uis(SLV2Plugin p) } slv2_match_end(uis); + slv2_node_free(ui_binary_node); slv2_node_free(ui_ui); if (slv2_uis_size(result) > 0) { |