X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flascar-el-usb%2Fapi.c;h=c64882c0bdb9913086bb24cd376b5da2c50e58d6;hb=692716f5d1aae4ef06c67b57aaf253f46f538c33;hp=aacc3ead108b2e9270d8562ac3e8011fb8188aea;hpb=dd7a72ea697a172032f5473b0ddff5e8d47222f4;p=libsigrok.git diff --git a/src/hardware/lascar-el-usb/api.c b/src/hardware/lascar-el-usb/api.c index aacc3ead..c64882c0 100644 --- a/src/hardware/lascar-el-usb/api.c +++ b/src/hardware/lascar-el-usb/api.c @@ -126,7 +126,6 @@ static int config_get(uint32_t key, GVariant **data, 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, 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) @@ -160,27 +158,26 @@ 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,