gplugin/gplugin

Fix some issues found in review and an issue scanbuild found
feature/loader-registration-cleanup
2020-02-23, Gary Kramlich
7d8168ca6f7b
Parents 50f787185664
Children 49b26135dff7
Fix some issues found in review and an issue scanbuild found
2 files changed, 16 insertions(+), 4 deletions(-)
  • +2 -1
    gplugin/gplugin-loader.c
  • +14 -3
    gplugin/gplugin-manager.c
    • --- a/gplugin/gplugin-loader.c Sun Feb 23 04:13:35 2020 -0600
    +++ b/gplugin/gplugin-loader.c Sun Feb 23 19:41:52 2020 -0600
    @@ -190,8 +190,9 @@
    g_return_val_if_fail(GPLUGIN_IS_LOADER(loader), NULL);
    klass = GPLUGIN_LOADER_GET_CLASS(loader);
    - if(klass != NULL && klass->supported_extensions)
    + if(klass != NULL && klass->supported_extensions) {
    return klass->supported_extensions(loader);
    + }
    return NULL;
    }
    --- a/gplugin/gplugin-manager.c Sun Feb 23 04:13:35 2020 -0600
    +++ b/gplugin/gplugin-manager.c Sun Feb 23 19:41:52 2020 -0600
    @@ -157,12 +157,12 @@
    return TRUE;
    }
    -/**
    +/*
    * gplugin_manager_find_loader_by_type:
    * @manager: The #GPluginManager instance.
    * @type: The #GType of the loader to find.
    *
    - * Looks up a #GPluginLoader instance by it's type.
    + * Looks up a #GPluginLoader instance by its type.
    *
    * Returns: (transfer none): The #GPluginLoader instance or %NULL.
    */
    @@ -1081,7 +1081,12 @@
    instance = g_object_new(GPLUGIN_TYPE_MANAGER, NULL);
    if(!gplugin_manager_register_loader(GPLUGIN_TYPE_NATIVE_LOADER, &error)) {
    - g_error("failed to register loader %s", error->message);
    + if(error != NULL) {
    + g_error("failed to register loader: %s", error->message);
    + g_error_free(error);
    + } else {
    + g_error("failed to register loader: unknown failure");
    + }
    }
    dependency_regex = g_regex_new(dependency_pattern, 0, 0, NULL);
    @@ -1263,6 +1268,9 @@
    if(klass && klass->register_loader)
    return klass->register_loader(manager, type, error);
    + g_set_error(error, GPLUGIN_DOMAIN, 0,
    + "register_loader method not implemented");
    +
    return FALSE;
    }
    @@ -1287,6 +1295,9 @@
    if(klass && klass->unregister_loader)
    return klass->unregister_loader(manager, type, error);
    + g_set_error(error, GPLUGIN_DOMAIN, 0,
    + "unregister_loader method not implemented");
    +
    return FALSE;
    }