output/csv: use intermediate time_t var, silence compiler warning

[libsigrok.git] / src / hardware / lascar-el-usb / api.c

diff --git a/src/hardware/lascar-el-usb/api.c b/src/hardware/lascar-el-usb/api.c
index f91755af32c1c7ec323e135567d98150841a5f41..64753d780dd2162648fde1982146d07d663d97e4 100644 (file)
--- a/src/hardware/lascar-el-usb/api.c
+++ b/src/hardware/lascar-el-usb/api.c
@@ -120,13 +120,12 @@ static int dev_close(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_get(uint32_t key, GVariant **data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
        struct sr_usb_dev_inst *usb;
        int ret;
-       char str[128];
 
        (void)cg;
 
@@ -136,8 +135,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
                if (!sdi || !sdi->conn)
                        return SR_ERR_ARG;
                usb = sdi->conn;
-               snprintf(str, 128, "%d.%d", usb->bus, usb->address);
-               *data = g_variant_new_string(str);
+               *data = g_variant_new_printf("%d.%d", usb->bus, usb->address);
                break;
        case SR_CONF_DATALOG:
                if (!sdi)
@@ -156,35 +154,34 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
        return SR_OK;
 }
 
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
-       int ret;
 
        (void)cg;
 
        devc = sdi->priv;
-       ret = SR_OK;
+
        switch (key) {
        case SR_CONF_DATALOG:
                if (g_variant_get_boolean(data))
-                       ret = lascar_start_logging(sdi);
+                       return lascar_start_logging(sdi);
                else
-                       ret = lascar_stop_logging(sdi);
+                       return lascar_stop_logging(sdi);
                break;
        case SR_CONF_LIMIT_SAMPLES:
                devc->limit_samples = g_variant_get_uint64(data);
                break;
        default:
-               ret = SR_ERR_NA;
+               return SR_ERR_NA;
        }
 
-       return ret;
+       return SR_OK;
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 }
@@ -291,7 +288,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        src = sr_config_new(SR_CONF_SAMPLE_INTERVAL, g_variant_new_uint64(interval));
        meta.config = g_slist_append(NULL, src);
        sr_session_send(sdi, &packet);
-       g_free(src);
+       g_slist_free(meta.config);
+       sr_config_free(src);
 
        if (devc->logged_samples == 0) {
                /* This ensures the frontend knows the session is done. */