Changeset 2086

Timestamp:

06/03/09 14:47:19 (9 months ago)

Author:

drobilla

Message:

Consistent error/warning message output.
Fix crash on invalid plugin files.

Location:

trunk/slv2

Files:

• src/collections.c (modified) (1 diff)
• src/plugin.c (modified) (4 diffs)
• src/plugininstance.c (modified) (5 diffs)
• src/pluginuiinstance.c (modified) (4 diffs)
• src/query.c (modified) (4 diffs)
• src/slv2_internal.h (modified) (1 diff)
• src/value.c (modified) (2 diffs)
• src/world.c (modified) (2 diffs)
• utils/lv2_inspect.c (modified) (1 diff)

trunk/slv2/src/collections.c

@@ -54 +54 @@
 prefix ## _get_at(CollType coll, unsigned index) \
 { \
-        if (index > INT_MAX) \
+        if (!coll || index > INT_MAX) \
                 return NULL; \
         else \

trunk/slv2/src/plugin.c

@@ -154 +154 @@
                         const char* index = (const char*)librdf_node_get_literal_value(index_node);
 
-                        //printf("PORT: %s %s %s\n", type, index, symbol);
-
                         const int this_index = atoi(index);
                         SLV2Port  this_port  = NULL;
@@ -373 +371 @@
 
         if ( ! (has_type && has_name && has_license && has_port) ) {
-                fprintf(stderr, "Invalid LV2 Plugin %s\n",
-                                slv2_value_as_uri(slv2_plugin_get_uri(plugin)));
+                SLV2_WARNF("Invalid plugin <%s>\n", slv2_value_as_uri(slv2_plugin_get_uri(plugin)));
                 return false;
         } else {
@@ -401 +398 @@
         }
 
+        if (!ret)
+                SLV2_WARNF("<%s> has no (mandatory) doap:name\n",
+                                slv2_value_as_string(slv2_plugin_get_uri(plugin)));
+
         return ret;
 }
@@ -469 +470 @@
 {
         if ( ! slv2_value_is_uri(subject)) {
-                fprintf(stderr, "slv2_plugin_get_value_for_subject error: "
-                                "subject is not a URI\n");
+                SLV2_ERROR("slv2_plugin_get_value_for_subject: subject not a URI\n");
                 return NULL;
         }

trunk/slv2/src/plugininstance.c

@@ -54 +54 @@
         void* lib = dlopen(lib_path, RTLD_NOW);
         if (!lib) {
-                fprintf(stderr, "Unable to open library %s (%s)\n", lib_path, dlerror());
+                SLV2_ERRORF("Unable to open library %s (%s)\n", lib_path, dlerror());
                 return NULL;
         }
@@ -61 +61 @@
 
         if (!df) {
-                fprintf(stderr, "Could not find symbol 'lv2_descriptor', "
+                SLV2_ERRORF("Could not find symbol 'lv2_descriptor', "
                                 "%s is not a LV2 plugin.\n", lib_path);
                 dlclose(lib);
@@ -72 +72 @@
                                         slv2_plugin_get_bundle_uri(plugin)));
 
-                //printf("Bundle path: %s\n", bundle_path);
-
                 for (uint32_t i=0; 1; ++i) {
 
@@ -79 +77 @@
 
                         if (!ld) {
-                                fprintf(stderr, "Did not find plugin %s in %s\n",
+                                SLV2_ERRORF("Did not find plugin %s in %s\n",
                                                 slv2_value_as_uri(slv2_plugin_get_uri(plugin)), lib_path);
                                 dlclose(lib);
                                 break; // return NULL
                         } else if (!strcmp(ld->URI, slv2_value_as_uri(slv2_plugin_get_uri(plugin)))) {
-
                                 assert(plugin->plugin_uri);
-
-                                //printf("Found %s at index %u in:\n\t%s\n\n",
-                                //              librdf_uri_as_string(plugin->plugin_uri), i, lib_path);
-
                                 assert(ld->instantiate);
 
@@ -111 +104 @@
                 // Failed to instantiate
                 if (result->lv2_handle == NULL) {
-                        //printf("Failed to instantiate %s\n", plugin->plugin_uri);
                         free(result);
                         return NULL;

trunk/slv2/src/pluginuiinstance.c

@@ -57 +57 @@
         void* lib = dlopen(lib_path, RTLD_NOW);
         if (!lib) {
-                fprintf(stderr, "Unable to open UI library %s (%s)\n", lib_path, dlerror());
+                SLV2_ERRORF("Unable to open UI library %s (%s)\n", lib_path, dlerror());
                 return NULL;
         }
@@ -64 +64 @@
 
         if (!df) {
-                fprintf(stderr, "Could not find symbol 'lv2ui_descriptor', "
+                SLV2_ERRORF("Could not find symbol 'lv2ui_descriptor', "
                                 "%s is not a LV2 plugin UI.\n", lib_path);
                 dlclose(lib);
@@ -77 +77 @@
 
                         if (!ld) {
-                                fprintf(stderr, "Did not find UI %s in %s\n",
+                                SLV2_ERRORF("Did not find UI %s in %s\n",
                                                 slv2_value_as_uri(slv2_ui_get_uri(ui)), lib_path);
                                 dlclose(lib);
                                 break; // return NULL
                         } else if (!strcmp(ld->URI, slv2_value_as_uri(slv2_ui_get_uri(ui)))) {
-
                                 assert(plugin->plugin_uri);
-
-                                printf("Found UI %s at index %u in:\n\t%s\n\n",
-                                       slv2_value_as_uri(plugin->plugin_uri), i, lib_path);
-
                                 assert(ld->instantiate);
 
@@ -111 +106 @@
         // Failed to instantiate
         if (result == NULL || result->pimpl->lv2ui_handle == NULL) {
-                //printf("Failed to instantiate %s\n", plugin->plugin_uri);
                 free(result);
                 return NULL;

trunk/slv2/src/query.c

@@ -65 +65 @@
                                 type = SLV2_VALUE_FLOAT;
                         else
-                                fprintf(stderr, "Unknown datatype %s\n", librdf_uri_as_string(datatype_uri));
+                                SLV2_ERRORF("Unknown datatype %s\n", librdf_uri_as_string(datatype_uri));
                 }
                 result = slv2_value_new(world, type, (const char*)librdf_node_get_literal_value(node));
@@ -75 +75 @@
         case LIBRDF_NODE_TYPE_UNKNOWN:
         default:
-                fprintf(stderr, "Unknown RDF node type %d\n", librdf_node_get_type(node));
+                SLV2_ERRORF("Unknown RDF node type %d\n", librdf_node_get_type(node));
                 break;
         }
@@ -97 +97 @@
 
                 if (node == NULL) {
-                        fprintf(stderr, "SLV2 ERROR: Variable %d bound to NULL.\n", variable);
+                        SLV2_ERRORF("Variable %d bound to NULL.\n", variable);
                         librdf_query_results_next(results->rdf_results);
                         continue;
@@ -138 +138 @@
         char* query_str = slv2_strjoin(slv2_query_prefixes, sparql_str, NULL);
 
-        //printf("******** Query \n%s********\n", query_str);
-
         librdf_query* query = librdf_new_query(plugin->world->world, "sparql", NULL,
                         (const unsigned char*)query_str, base_uri);
 
         if (!query) {
-                fprintf(stderr, "ERROR: Could not create query\n");
+                SLV2_ERRORF("Failed to create query:\n%s", query_str);
                 return NULL;
         }
 
-        // FIXME: locale kludges to work around librdf bug
+        // Reset numeric locale to correctly interpret turtle numeric constants
         char* locale = strdup(setlocale(LC_NUMERIC, NULL));
-
         setlocale(LC_NUMERIC, "POSIX");
+
         librdf_query_results* results = librdf_query_execute(query, plugin->rdf);
+
+        // Restore numeric locale
         setlocale(LC_NUMERIC, locale);
 

trunk/slv2/src/slv2_internal.h

@@ -241 +241 @@
 char* slv2_get_lang();
 
+#define SLV2_ERROR(str)       fprintf(stderr, "ERROR: %s: " str, __func__)
+#define SLV2_ERRORF(fmt, ...) fprintf(stderr, "ERROR: %s: " fmt, __func__, __VA_ARGS__)
+
+#define SLV2_WARN(str) fprintf(stderr, "WARNING: %s: " str, __func__)
+#define SLV2_WARNF(fmt, ...) fprintf(stderr, "WARNING: %s: " fmt, __func__, __VA_ARGS__)
 
 #ifdef __cplusplus

trunk/slv2/src/value.c

@@ -97 +97 @@
                                 val->type = SLV2_VALUE_FLOAT;
                         else
-                                fprintf(stderr, "Unknown datatype %s\n", librdf_uri_as_string(datatype_uri));
+                                SLV2_ERRORF("Unknown datatype %s\n", librdf_uri_as_string(datatype_uri));
                 }
                 val->str_val = strdup((char*)librdf_node_get_literal_value(node));
@@ -104 +104 @@
         case LIBRDF_NODE_TYPE_UNKNOWN:
         default:
-                fprintf(stderr, "slv2_value_new_librdf_node error: Unknown node type.");
+                SLV2_ERROR("Unknown node type");
                 free(val);
                 val = NULL;

trunk/slv2/src/world.c

@@ -45 +45 @@
         world->storage = librdf_new_storage(world->world, "trees", NULL, NULL);
         if (!world->storage) {
-                fprintf(stderr, "Warning: Unable to create \"trees\" RDF storage.\n"
-                                "Performance can be improved by upgrading librdf.\n");
+                SLV2_WARN("Warning: Unable to create \"trees\" RDF storage.\n"
+                                "Performance can be improved by upgrading librdf.\n");
                 world->storage = librdf_new_storage(world->world, "hashes", NULL,
                                 "hash-type='memory'");
@@ -178 +178 @@
 {
         if (!slv2_value_is_uri(bundle_uri)) {
-                fprintf(stderr, "ERROR: slv2_world_load_bundle called with non-URI argument\n");
+                SLV2_ERROR("Bundle 'URI' is not a URI\n");
                 return;
         }

trunk/slv2/utils/lv2_inspect.c

@@ -103 +103 @@
 
         val = slv2_plugin_get_name(p);
-        printf("\tName:              %s\n", slv2_value_as_string(val));
-        slv2_value_free(val);
+        if (val) {
+                printf("\tName:              %s\n", slv2_value_as_string(val));
+                slv2_value_free(val);
+        }
 
         SLV2Value class_label = slv2_plugin_class_get_label(slv2_plugin_get_class(p));
-        printf("\tClass:             %s\n", slv2_value_as_string(class_label));
+        if (class_label) {
+                printf("\tClass:             %s\n", slv2_value_as_string(class_label));
+        }
 
         val = slv2_plugin_get_author_name(p);