X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fbackend.c;h=49ea9cd52088708e3a02a014f4bdb6fdc98953a6;hb=702f42e8eb33d8d1ffb5b748097428c0f4434c6d;hp=5f5f4e88d7f8cb2dd68e34d26fe068b145316079;hpb=17bfaca62aaacec71c6da4bd927af051727593b6;p=libsigrok.git diff --git a/src/backend.c b/src/backend.c index 5f5f4e88..49ea9cd5 100644 --- a/src/backend.c +++ b/src/backend.c @@ -238,10 +238,6 @@ static int sanity_check_all_input_modules(void) sr_err("No description in module %d ('%s').", i, d); errors++; } - if (!inputs[i]->format_match) { - sr_err("No format_match in module %d ('%s').", i, d); - errors++; - } if (!inputs[i]->init) { sr_err("No init in module %d ('%s').", i, d); errors++; @@ -250,6 +246,10 @@ static int sanity_check_all_input_modules(void) 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++; + } if (errors == 0) continue; @@ -306,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. * @@ -347,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) {