Consistently use g_malloc0() for allocating devc.

[libsigrok.git] / src / hardware / victor-dmm / api.c

diff --git a/src/hardware/victor-dmm/api.c b/src/hardware/victor-dmm/api.c
index fe419443c559a0ef050cfabdecfd2b10eb6b5ff4..c1620161c953eb38acd5dc82eb05fb5c8b322d6d 100644 (file)
--- a/src/hardware/victor-dmm/api.c
+++ b/src/hardware/victor-dmm/api.c
@@ -35,16 +35,18 @@ SR_PRIV struct sr_dev_driver victor_dmm_driver_info;
 static struct sr_dev_driver *di = &victor_dmm_driver_info;
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
 
+static const uint32_t drvopts[] = {
+       SR_CONF_MULTIMETER,
+};
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
 };
 
 static const uint32_t devopts[] = {
-       SR_CONF_MULTIMETER,
        SR_CONF_CONTINUOUS,
-       SR_CONF_CONN | SR_CONF_GET,
        SR_CONF_LIMIT_SAMPLES | SR_CONF_SET,
        SR_CONF_LIMIT_MSEC | SR_CONF_SET,
+       SR_CONF_CONN | SR_CONF_GET,
 };
 
 static int init(struct sr_context *sr_ctx)
@@ -82,14 +84,12 @@ static GSList *scan(GSList *options)
 
                usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
 
-               sdi = sr_dev_inst_new();
+               sdi = g_malloc0(sizeof(struct sr_dev_inst));
                sdi->status = SR_ST_INACTIVE;
                sdi->vendor = g_strdup(VICTOR_VENDOR);
                sdi->driver = di;
                sdi->connection_id = g_strdup(connection_id);
-
-               if (!(devc = g_try_malloc0(sizeof(struct dev_context))))
-                       return NULL;
+               devc = g_malloc0(sizeof(struct dev_context));
                sdi->priv = devc;
 
                if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1")))
@@ -280,8 +280,12 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                                scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
                break;
        case SR_CONF_DEVICE_OPTIONS:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                               devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
+               if (!sdi)
+                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                                       drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
+               else
+                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                                       devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
                break;
        default:
                return SR_ERR_NA;