Simplify a few config_set() callbacks.

[libsigrok.git] / src / backend.c

diff --git a/src/backend.c b/src/backend.c
index e6297f54527e81245bfc2cc9e96c35aabb264795..c2a83cfedfe4f48a831696ee1b58dfe0b99a10a4 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -215,7 +215,7 @@ static int sanity_check_all_drivers(void)
 static int sanity_check_all_input_modules(void)
 {
        int i, errors, ret = SR_OK;
-       struct sr_input_module **inputs;
+       const struct sr_input_module **inputs;
        const char *d;
 
        sr_spew("Sanity-checking all input modules.");
@@ -230,20 +230,24 @@ static int sanity_check_all_input_modules(void)
                        sr_err("No ID in module %d ('%s').", i, d);
                        errors++;
                }
-               if (!inputs[i]->description) {
-                       sr_err("No description in module %d ('%s').", i, d);
+               if (!inputs[i]->name) {
+                       sr_err("No name in module %d ('%s').", i, d);
                        errors++;
                }
-               if (!inputs[i]->format_match) {
-                       sr_err("No format_match in module %d ('%s').", i, d);
+               if (!inputs[i]->desc) {
+                       sr_err("No description in module %d ('%s').", i, d);
                        errors++;
                }
                if (!inputs[i]->init) {
                        sr_err("No init in module %d ('%s').", i, d);
                        errors++;
                }
-               if (!inputs[i]->loadfile) {
-                       sr_err("No loadfile in module %d ('%s').", i, d);
+               if (!inputs[i]->receive) {
+                       sr_err("No receive in module %d ('%s').", i, d);
+                       errors++;
+               }
+               if (!inputs[i]->end) {
+                       sr_err("No end in module %d ('%s').", i, d);
                        errors++;
                }
 
@@ -302,6 +306,55 @@ static int sanity_check_all_output_modules(void)
        return ret;
 }
 
+/**
+ * Sanity-check all libsigrok transform modules.
+ *
+ * @retval SR_OK All modules are OK
+ * @retval SR_ERR One or more modules have issues.
+ */
+static int sanity_check_all_transform_modules(void)
+{
+       int i, errors, ret = SR_OK;
+       const struct sr_transform_module **transforms;
+       const char *d;
+
+       sr_spew("Sanity-checking all transform modules.");
+
+       transforms = sr_transform_list();
+       for (i = 0; transforms[i]; i++) {
+               errors = 0;
+
+               d = (transforms[i]->id) ? transforms[i]->id : "NULL";
+
+               if (!transforms[i]->id) {
+                       sr_err("No ID in module %d ('%s').", i, d);
+                       errors++;
+               }
+               if (!transforms[i]->name) {
+                       sr_err("No name in module %d ('%s').", i, d);
+                       errors++;
+               }
+               if (!transforms[i]->desc) {
+                       sr_err("No description in module '%s'.", d);
+                       errors++;
+               }
+               /* Note: options() is optional. */
+               /* Note: init() is optional. */
+               if (!transforms[i]->receive) {
+                       sr_err("No receive in module '%s'.", d);
+                       errors++;
+               }
+               /* Note: cleanup() is optional. */
+
+               if (errors == 0)
+                       continue;
+
+               ret = SR_ERR;
+       }
+
+       return ret;
+}
+
 /**
  * Initialize libsigrok.
  *
@@ -343,14 +396,14 @@ SR_API int sr_init(struct sr_context **ctx)
                return ret;
        }
 
-       /* + 1 to handle when struct sr_context has no members. */
-       context = g_try_malloc0(sizeof(struct sr_context) + 1);
-
-       if (!context) {
-               ret = SR_ERR_MALLOC;
-               goto done;
+       if (sanity_check_all_transform_modules() < 0) {
+               sr_err("Internal transform module error(s), aborting.");
+               return ret;
        }
 
+       /* + 1 to handle when struct sr_context has no members. */
+       context = g_malloc0(sizeof(struct sr_context) + 1);
+
 #ifdef HAVE_LIBUSB_1_0
        ret = libusb_init(&context->libusb_ctx);
        if (LIBUSB_SUCCESS != ret) {
@@ -393,6 +446,7 @@ SR_API int sr_exit(struct sr_context *ctx)
        libusb_exit(ctx->libusb_ctx);
 #endif
 
+       g_free(sr_driver_list());
        g_free(ctx);
 
        return SR_OK;