sr_voltage_string(): Add a space before the unit.

[libsigrok.git] / src / strutil.c

diff --git a/src/strutil.c b/src/strutil.c
index 72378d4a2942d5dd7f411e35d41ffb7a01b9a183..fd9a438e647a6210e63091050b78c7790ffe97be 100644 (file)
--- a/src/strutil.c
+++ b/src/strutil.c
@@ -366,42 +366,31 @@ SR_API char *sr_samplerate_string(uint64_t samplerate)
 SR_API char *sr_period_string(uint64_t v_p, uint64_t v_q)
 {
        double freq, v;
-       char *o;
-       int prec, r;
+       int prec;
 
        freq = 1 / ((double)v_p / v_q);
 
-       o = g_malloc0(30 + 1);
-
        if (freq > SR_GHZ(1)) {
                v = (double)v_p / v_q * 1000000000000.0;
                prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3;
-               r = snprintf(o, 30, "%.*f ps", prec, v);
+               return g_strdup_printf("%.*f ps", prec, v);
        } else if (freq > SR_MHZ(1)) {
                v = (double)v_p / v_q * 1000000000.0;
                prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3;
-               r = snprintf(o, 30, "%.*f ns", prec, v);
+               return g_strdup_printf("%.*f ns", prec, v);
        } else if (freq > SR_KHZ(1)) {
                v = (double)v_p / v_q * 1000000.0;
                prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3;
-               r = snprintf(o, 30, "%.*f us", prec, v);
+               return g_strdup_printf("%.*f us", prec, v);
        } else if (freq > 1) {
                v = (double)v_p / v_q * 1000.0;
                prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3;
-               r = snprintf(o, 30, "%.*f ms", prec, v);
+               return g_strdup_printf("%.*f ms", prec, v);
        } else {
                v = (double)v_p / v_q;
                prec = ((v - (uint64_t)v) < FLT_MIN) ? 0 : 3;
-               r = snprintf(o, 30, "%.*f s", prec, v);
-       }
-
-       if (r < 0) {
-               /* Something went wrong... */
-               g_free(o);
-               return NULL;
+               return g_strdup_printf("%.*f s", prec, v);
        }
-
-       return o;
 }
 
 /**
@@ -422,25 +411,12 @@ SR_API char *sr_period_string(uint64_t v_p, uint64_t v_q)
  */
 SR_API char *sr_voltage_string(uint64_t v_p, uint64_t v_q)
 {
-       int r;
-       char *o;
-
-       o = g_malloc0(30 + 1);
-
        if (v_q == 1000)
-               r = snprintf(o, 30, "%" PRIu64 "mV", v_p);
+               return g_strdup_printf("%" PRIu64 " mV", v_p);
        else if (v_q == 1)
-               r = snprintf(o, 30, "%" PRIu64 "V", v_p);
+               return g_strdup_printf("%" PRIu64 " V", v_p);
        else
-               r = snprintf(o, 30, "%gV", (float)v_p / (float)v_q);
-
-       if (r < 0) {
-               /* Something went wrong... */
-               g_free(o);
-               return NULL;
-       }
-
-       return o;
+               return g_strdup_printf("%g V", (float)v_p / (float)v_q);
 }
 
 /**
@@ -555,8 +531,13 @@ SR_API uint64_t sr_parse_timestring(const char *timestring)
 /** @since 0.1.0 */
 SR_API gboolean sr_parse_boolstring(const char *boolstr)
 {
-       if (!boolstr)
-               return FALSE;
+       /*
+        * Complete absence of an input spec is assumed to mean TRUE,
+        * as in command line option strings like this:
+        *   ...:samplerate=100k:header:numchannels=4:...
+        */
+       if (!boolstr || !*boolstr)
+               return TRUE;
 
        if (!g_ascii_strncasecmp(boolstr, "true", 4) ||
            !g_ascii_strncasecmp(boolstr, "yes", 3) ||