X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=strutil.c;h=ad9f64974fe8c477df34f9749700ad1f11bddd1e;hb=ccf35720c0494f4102fba8ee0a44ce1d3b67fc10;hp=5ac9b71912a7ef1fa4a03f6fef784f5e6727313d;hpb=5edc02c77c3576a47ee85241f32785cdf0fdddf8;p=libsigrok.git

diff --git a/strutil.c b/strutil.c
index 5ac9b719..ad9f6497 100644
--- a/strutil.c
+++ b/strutil.c
@@ -165,8 +165,8 @@ SR_API char *sr_period_string(uint64_t frequency)
  */
 SR_API char *sr_voltage_string(struct sr_rational *voltage)
 {
-	char *o;
 	int r;
+	char *o;
 
 	if (!(o = g_try_malloc0(30 + 1))) {
 		sr_err("%s: o malloc failed", __func__);
@@ -178,7 +178,7 @@ SR_API char *sr_voltage_string(struct sr_rational *voltage)
 	else if (voltage->q == 1)
 		r = snprintf(o, 30, "%" PRIu64 "V", voltage->p);
 	else
-		r = -1;
+		r = snprintf(o, 30, "%gV", (float)voltage->p / (float)voltage->q);
 
 	if (r < 0) {
 		/* Something went wrong... */
@@ -230,7 +230,7 @@ SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi,
 		return NULL;
 	}
 
-	if (sdi->driver->info_get(SR_DI_TRIGGER_TYPES,
+	if (sdi->driver->config_list(SR_CONF_TRIGGER_TYPE,
 			(const void **)&trigger_types, sdi) != SR_OK) {
 		sr_err("%s: Device doesn't support any triggers.", __func__);
 		return NULL;