output/wav: fixup coding style nits, adjust data types

[libsigrok.git] / src / strutil.c

diff --git a/src/strutil.c b/src/strutil.c
index fd9a438e647a6210e63091050b78c7790ffe97be..5344ec2903218bef4c7e9baabd3412d10b7929e5 100644 (file)
--- a/src/strutil.c
+++ b/src/strutil.c
@@ -18,11 +18,13 @@
  */
 
 #include <config.h>
+#include <ctype.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
@@ -66,6 +68,9 @@ SR_PRIV int sr_atol(const char *str, long *ret)
        errno = 0;
        tmp = strtol(str, &endptr, 10);
 
+       while (endptr && isspace(*endptr))
+               endptr++;
+
        if (!endptr || *endptr || errno) {
                if (!errno)
                        errno = EINVAL;
@@ -128,6 +133,9 @@ SR_PRIV int sr_atod(const char *str, double *ret)
        errno = 0;
        tmp = strtof(str, &endptr);
 
+       while (endptr && isspace(*endptr))
+               endptr++;
+
        if (!endptr || *endptr || errno) {
                if (!errno)
                        errno = EINVAL;
@@ -168,6 +176,38 @@ SR_PRIV int sr_atof(const char *str, float *ret)
        return SR_OK;
 }
 
+/**
+ * @private
+ *
+ * Convert a string representation of a numeric value to a double. The
+ * conversion is strict and will fail if the complete string does not represent
+ * a valid double. The function sets errno according to the details of the
+ * failure. This version ignores the locale.
+ *
+ * @param str The string representation to convert.
+ * @param ret Pointer to double where the result of the conversion will be stored.
+ *
+ * @retval SR_OK Conversion successful.
+ * @retval SR_ERR Failure.
+ */
+SR_PRIV int sr_atod_ascii(const char *str, double *ret)
+{
+       double tmp;
+       char *endptr = NULL;
+
+       errno = 0;
+       tmp = g_ascii_strtod(str, &endptr);
+
+       if (!endptr || *endptr || errno) {
+               if (!errno)
+                       errno = EINVAL;
+               return SR_ERR;
+       }
+
+       *ret = tmp;
+       return SR_OK;
+}
+
 /**
  * @private
  *
@@ -233,13 +273,19 @@ SR_API int sr_parse_rational(const char *str, struct sr_rational *ret)
        int64_t denominator = 1;
        int32_t fractional_len = 0;
        int32_t exponent = 0;
+       bool is_negative = false;
 
        errno = 0;
        integral = g_ascii_strtoll(str, &endptr, 10);
 
-       if (errno)
+       if (str == endptr && (str[0] == '-' || str[0] == '+') && str[1] == '.')
+               endptr += 1;
+       else if (errno)
                return SR_ERR;
 
+       if (integral < 0 || str[0] == '-')
+               is_negative = true;
+
        if (*endptr == '.') {
                const char* start = endptr + 1;
                fractional = g_ascii_strtoll(start, &endptr, 10);
@@ -261,7 +307,7 @@ SR_API int sr_parse_rational(const char *str, struct sr_rational *ret)
                integral *= 10;
        exponent -= fractional_len;
 
-       if (integral >= 0)
+       if (!is_negative)
                integral += fractional;
        else
                integral -= fractional;
@@ -438,7 +484,8 @@ SR_API char *sr_voltage_string(uint64_t v_p, uint64_t v_q)
  */
 SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size)
 {
-       int multiplier, done;
+       uint64_t multiplier;
+       int done;
        double frac_part;
        char *s;
 
@@ -465,6 +512,18 @@ SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size)
                case 'G':
                        multiplier = SR_GHZ(1);
                        break;
+               case 't':
+               case 'T':
+                       multiplier = SR_GHZ(1000);
+                       break;
+               case 'p':
+               case 'P':
+                       multiplier = SR_GHZ(1000 * 1000);
+                       break;
+               case 'e':
+               case 'E':
+                       multiplier = SR_GHZ(1000 * 1000 * 1000);
+                       break;
                default:
                        done = TRUE;
                        s--;
@@ -474,8 +533,9 @@ SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size)
        if (multiplier > 0) {
                *size *= multiplier;
                *size += frac_part * multiplier;
-       } else
+       } else {
                *size += frac_part;
+       }
 
        if (s && *s && g_ascii_strcasecmp(s, "Hz"))
                return SR_ERR;