Build: Set local include directories in Makefile.am

[libsigrok.git] / src / strutil.c

diff --git a/src/strutil.c b/src/strutil.c
index 0306ea7c91f940002861e2ce114654e6a82b0b39..bb5913f392ca434aa15407f436f74746815201d0 100644 (file)
--- a/src/strutil.c
+++ b/src/strutil.c
@@ -21,8 +21,9 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <errno.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
@@ -230,7 +231,7 @@ SR_PRIV int sr_atof_ascii(const char *str, float *ret)
  * @param unit The unit to append to the string, or NULL if the string
  *             has no units.
  *
- * @return A g_try_malloc()ed string representation of the samplerate value,
+ * @return A newly allocated string representation of the samplerate value,
  *         or NULL upon errors. The caller is responsible to g_free() the
  *         memory.
  *
@@ -246,7 +247,7 @@ SR_API char *sr_si_string_u64(uint64_t x, const char *unit)
        const char *p, prefix[] = "\0kMGTPE";
        char fmt[16], fract[20] = "", *f;
 
-       if (unit == NULL)
+       if (!unit)
                unit = "";
 
        for (i = 0; (quot = x / divisor[i]) >= 1000; i++);
@@ -272,7 +273,7 @@ SR_API char *sr_si_string_u64(uint64_t x, const char *unit)
  *
  * @param samplerate The samplerate in Hz.
  *
- * @return A g_try_malloc()ed string representation of the samplerate value,
+ * @return A newly allocated string representation of the samplerate value,
  *         or NULL upon errors. The caller is responsible to g_free() the
  *         memory.
  *
@@ -291,7 +292,7 @@ SR_API char *sr_samplerate_string(uint64_t samplerate)
  *
  * @param frequency The frequency in Hz.
  *
- * @return A g_try_malloc()ed string representation of the frequency value,
+ * @return A newly allocated string representation of the frequency value,
  *         or NULL upon errors. The caller is responsible to g_free() the
  *         memory.
  *
@@ -303,10 +304,7 @@ SR_API char *sr_period_string(uint64_t frequency)
        int r;
 
        /* Allocate enough for a uint64_t as string + " ms". */
-       if (!(o = g_try_malloc0(30 + 1))) {
-               sr_err("%s: o malloc failed", __func__);
-               return NULL;
-       }
+       o = g_malloc0(30 + 1);
 
        if (frequency >= SR_GHZ(1))
                r = snprintf(o, 30, "%" PRIu64 " ns", frequency / 1000000000);
@@ -336,7 +334,7 @@ SR_API char *sr_period_string(uint64_t frequency)
  * @param v_p The voltage numerator.
  * @param v_q The voltage denominator.
  *
- * @return A g_try_malloc()ed string representation of the voltage value,
+ * @return A newly allocated string representation of the voltage value,
  *         or NULL upon errors. The caller is responsible to g_free() the
  *         memory.
  *
@@ -347,10 +345,7 @@ SR_API char *sr_voltage_string(uint64_t v_p, uint64_t v_q)
        int r;
        char *o;
 
-       if (!(o = g_try_malloc0(30 + 1))) {
-               sr_err("%s: o malloc failed", __func__);
-               return NULL;
-       }
+       o = g_malloc0(30 + 1);
 
        if (v_q == 1000)
                r = snprintf(o, 30, "%" PRIu64 "mV", v_p);