Use g_malloc0() consistently, simplify error handling.

[libsigrok.git] / src / hwdriver.c

diff --git a/src/hwdriver.c b/src/hwdriver.c
index c2ce6e6e2db6526b5e8f507abb186c4437075b3c..ca579f6741780fa2464aab37d3c462bc9eafb836 100644 (file)
--- a/src/hwdriver.c
+++ b/src/hwdriver.c
@@ -395,8 +395,7 @@ SR_PRIV struct sr_config *sr_config_new(uint32_t key, GVariant *data)
 {
        struct sr_config *src;
 
-       if (!(src = g_try_malloc(sizeof(struct sr_config))))
-               return NULL;
+       src = g_malloc0(sizeof(struct sr_config));
        src->key = key;
        src->data = g_variant_ref_sink(data);
 
@@ -616,9 +615,9 @@ SR_API int sr_config_list(const struct sr_dev_driver *driver,
        int ret;
 
        if (!driver || !data)
-               ret = SR_ERR;
+               return SR_ERR;
        else if (!driver->config_list)
-               ret = SR_ERR_ARG;
+               return SR_ERR_ARG;
        else if (key != SR_CONF_SCAN_OPTIONS && key != SR_CONF_DEVICE_OPTIONS) {
                if (check_key(driver, sdi, cg, key, SR_CONF_LIST) != SR_OK)
                        return SR_ERR_ARG;