X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fstrutil.c;h=d817e642d8f1cb9dfb44292c9ea0d8acf11f73af;hb=refs%2Fheads%2Flibsigrok-0.4.x;hp=54dc1f39df50123ac985a158bc3d9ca425f9f5a6;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git

diff --git a/src/strutil.c b/src/strutil.c
index 54dc1f39..d817e642 100644
--- a/src/strutil.c
+++ b/src/strutil.c
@@ -18,11 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <config.h>
 #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 */
@@ -56,8 +58,6 @@
  *
  * @retval SR_OK Conversion successful.
  * @retval SR_ERR Failure.
- *
- * @since 0.3.0
  */
 SR_PRIV int sr_atol(const char *str, long *ret)
 {
@@ -90,8 +90,6 @@ SR_PRIV int sr_atol(const char *str, long *ret)
  *
  * @retval SR_OK Conversion successful.
  * @retval SR_ERR Failure.
- *
- * @since 0.3.0
  */
 SR_PRIV int sr_atoi(const char *str, int *ret)
 {
@@ -122,8 +120,6 @@ SR_PRIV int sr_atoi(const char *str, int *ret)
  *
  * @retval SR_OK Conversion successful.
  * @retval SR_ERR Failure.
- *
- * @since 0.3.0
  */
 SR_PRIV int sr_atod(const char *str, double *ret)
 {
@@ -156,8 +152,6 @@ SR_PRIV int sr_atod(const char *str, double *ret)
  *
  * @retval SR_OK Conversion successful.
  * @retval SR_ERR Failure.
- *
- * @since 0.3.0
  */
 SR_PRIV int sr_atof(const char *str, float *ret)
 {
@@ -188,8 +182,6 @@ SR_PRIV int sr_atof(const char *str, float *ret)
  *
  * @retval SR_OK Conversion successful.
  * @retval SR_ERR Failure.
- *
- * @since 0.3.0
  */
 SR_PRIV int sr_atof_ascii(const char *str, float *ret)
 {
@@ -230,7 +222,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 +238,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 +264,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 +283,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 +295,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 +325,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 +336,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);
@@ -426,7 +412,7 @@ SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size)
 	} else
 		*size += frac_part;
 
-	if (*s && strcasecmp(s, "Hz"))
+	if (s && *s && g_ascii_strcasecmp(s, "Hz"))
 		return SR_ERR;
 
 	return SR_OK;
@@ -538,9 +524,9 @@ SR_API int sr_parse_voltage(const char *voltstr, uint64_t *p, uint64_t *q)
 	if (s && *s) {
 		while (*s == ' ')
 			s++;
-		if (!strcasecmp(s, "mv"))
+		if (!g_ascii_strcasecmp(s, "mv"))
 			*q = 1000L;
-		else if (!strcasecmp(s, "v"))
+		else if (!g_ascii_strcasecmp(s, "v"))
 			*q = 1;
 		else
 			/* Must have a base suffix. */