diff options
| author | David Robillard <d@drobilla.net> | 2006-06-11 18:08:50 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-06-11 18:08:50 +0000 |
| commit | af72224cba09c873c1f8e81d7bd9db9747f9553d (patch) | |
| tree | 7cc8379be2362ab7312eb50c4020bdd9feb4adfa /src/pluginlist.c | |
| parent | 7fd4168fe8581e46f4ee35cc182db6220b6eed04 (diff) | |
| download | lilv-af72224cba09c873c1f8e81d7bd9db9747f9553d.tar.gz lilv-af72224cba09c873c1f8e81d7bd9db9747f9553d.tar.bz2 lilv-af72224cba09c873c1f8e81d7bd9db9747f9553d.zip | |
Fixed query problems on 64-bit
git-svn-id: http://svn.drobilla.net/lad/libslv2@23 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/pluginlist.c')
| -rw-r--r-- | src/pluginlist.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/pluginlist.c b/src/pluginlist.c index 61e4c4b..20e9dea 100644 --- a/src/pluginlist.c +++ b/src/pluginlist.c @@ -138,9 +138,12 @@ slv2_list_load_bundle(SLV2List list, rasqal_query_results_next(results); } - rasqal_free_query_results(results); - rasqal_free_query(rq); - raptor_free_uri(base_uri); + // FIXME: leaks? rasqal really doesn't handle missing files well.. + if (results) { + rasqal_free_query_results(results); + rasqal_free_query(rq); + raptor_free_uri(base_uri); // FIXME: leak? + } rasqal_finish(); free(manifest_uri); @@ -162,8 +165,8 @@ add_plugins_from_dir(SLV2List list, const char* dir) if (!strcmp(pfile->d_name, ".") || !strcmp(pfile->d_name, "..")) continue; - char* bundle_path = (char*)ustrjoin(U(dir), U("/"), U(pfile->d_name), 0); - char* bundle_url = (char*)ustrjoin(U("file://"), U(dir), U("/"), U(pfile->d_name), 0); + char* bundle_path = (char*)ustrjoin(U(dir), U("/"), U(pfile->d_name), NULL); + char* bundle_url = (char*)ustrjoin(U("file://"), U(dir), U("/"), U(pfile->d_name), NULL); DIR* bundle_dir = opendir(bundle_path); if (bundle_dir != NULL) { @@ -185,7 +188,7 @@ slv2_list_load_path(SLV2List list, const char* slv2_path) { - char* path = (char*)ustrjoin(U(slv2_path), U(":"), 0); + char* path = (char*)ustrjoin(U(slv2_path), U(":"), NULL); char* dir = path; // Pointer into path |