gmc-mh-1x-2x: Added new driver gmc-mh-2x-bd232.

[libsigrok.git] / strutil.c

diff --git a/strutil.c b/strutil.c
index f8644d72946feb578f5858265f1e017f9dfa529c..0438c5ecc03cf74516c1be3bda1f8876ed419758 100644 (file)
--- a/strutil.c
+++ b/strutil.c
@@ -25,14 +25,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "strutil: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "strutil"
 
 /**
  * @file
@@ -49,6 +42,8 @@
  */
 
 /**
+ * @private
+ *
  * Convert a string representation of a numeric value to a long integer. The
  * conversion is strict and will fail if the complete string does not represent
  * a valid long integer. The function sets errno according to the details of the
@@ -80,6 +75,8 @@ SR_PRIV int sr_atol(const char *str, long *ret)
 }
 
 /**
+ * @private
+ *
  * Convert a string representation of a numeric value to an integer. The
  * conversion is strict and will fail if the complete string does not represent
  * a valid integer. The function sets errno according to the details of the
@@ -109,6 +106,8 @@ SR_PRIV int sr_atoi(const char *str, int *ret)
 }
 
 /**
+ * @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
@@ -140,6 +139,8 @@ SR_PRIV int sr_atod(const char *str, double *ret)
 }
 
 /**
+ * @private
+ *
  * Convert a string representation of a numeric value to a float. The
  * conversion is strict and will fail if the complete string does not represent
  * a valid float. The function sets errno according to the details of the
@@ -168,6 +169,49 @@ SR_PRIV int sr_atof(const char *str, float *ret)
        return SR_OK;
 }
 
+/**
+ * @private
+ *
+ * Convert a string representation of a numeric value to a float. The
+ * conversion is strict and will fail if the complete string does not represent
+ * a valid float. 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 float where the result of the conversion will be stored.
+ *
+ * @return SR_OK if conversion is successful, otherwise SR_ERR.
+ *
+ * @since 0.3.0
+ */
+SR_PRIV int sr_atof_ascii(const char *str, float *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;
+       }
+
+       /* FIXME This fails unexpectedly. Some other method to safel downcast
+        * needs to be found. Checking against FLT_MAX doesn't work as well. */
+       /*
+       if ((float) tmp != tmp) {
+               errno = ERANGE;
+               sr_dbg("ERANGEEEE %e != %e", (float) tmp, tmp);
+               return SR_ERR;
+       }
+       */
+
+       *ret = (float) tmp;
+       return SR_OK;
+}
+
 /**
  * Convert a numeric value value to its "natural" string representation
  * in SI units.
@@ -191,7 +235,7 @@ SR_API char *sr_si_string_u64(uint64_t x, const char *unit)
                SR_GHZ(1000), SR_GHZ(1000 * 1000), SR_GHZ(1000 * 1000 * 1000),
        };
        const char *p, prefix[] = "\0kMGTPE";
-       char fmt[8], fract[20] = "", *f;
+       char fmt[16], fract[20] = "", *f;
 
        if (unit == NULL)
                unit = "";
@@ -199,7 +243,7 @@ SR_API char *sr_si_string_u64(uint64_t x, const char *unit)
        for (i = 0; (quot = x / divisor[i]) >= 1000; i++);
 
        if (i) {
-               sprintf(fmt, ".%%0%dlu", i * 3);
+               sprintf(fmt, ".%%0%d"PRIu64, i * 3);
                f = fract + sprintf(fract, fmt, x % divisor[i]) - 1;
 
                while (f >= fract && strchr("0.", *f))
@@ -421,15 +465,20 @@ SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi,
 SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size)
 {
        int multiplier, done;
+       double frac_part;
        char *s;
 
        *size = strtoull(sizestring, &s, 10);
        multiplier = 0;
+       frac_part = 0;
        done = FALSE;
        while (s && *s && multiplier == 0 && !done) {
                switch (*s) {
                case ' ':
                        break;
+               case '.':
+                       frac_part = g_ascii_strtod(s, &s);
+                       break;
                case 'k':
                case 'K':
                        multiplier = SR_KHZ(1);
@@ -448,8 +497,11 @@ SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size)
                }
                s++;
        }
-       if (multiplier > 0)
+       if (multiplier > 0) {
                *size *= multiplier;
+               *size += frac_part * multiplier;
+       } else
+               *size += frac_part;
 
        if (*s && strcasecmp(s, "Hz"))
                return SR_ERR;