X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=strutil.c;h=9cd194ede5257722e4f971afb4554923251b4386;hb=44dae539254e324e0330e194f9c775be3d761503;hp=380d78f59efdbb0bf72009c903484a85d9f87a06;hpb=4d436e71ba6059b217a3d90775033e850944ad42;p=libsigrok.git

diff --git a/strutil.c b/strutil.c
index 380d78f5..9cd194ed 100644
--- a/strutil.c
+++ b/strutil.c
@@ -21,8 +21,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 /**
  * Convert a numeric samplerate value to its "natural" string representation.
@@ -30,17 +30,21 @@
  * E.g. a value of 3000000 would be converted to "3 MHz", 20000 to "20 kHz".
  *
  * @param samplerate The samplerate in Hz.
- * @return A malloc()ed string representation of the samplerate value,
- *         or NULL upon errors. The caller is responsible to free() the memory.
+ *
+ * @return A g_try_malloc()ed string representation of the samplerate value,
+ *         or NULL upon errors. The caller is responsible to g_free() the
+ *         memory.
  */
-char *sr_samplerate_string(uint64_t samplerate)
+SR_API char *sr_samplerate_string(uint64_t samplerate)
 {
 	char *o;
 	int r;
 
-	o = malloc(30 + 1); /* Enough for a uint64_t as string + " GHz". */
-	if (!o)
+	/* Allocate enough for a uint64_t as string + " GHz". */
+	if (!(o = g_try_malloc0(30 + 1))) {
+		sr_err("strutil: %s: o malloc failed", __func__);
 		return NULL;
+	}
 
 	if (samplerate >= SR_GHZ(1))
 		r = snprintf(o, 30, "%" PRIu64 " GHz", samplerate / 1000000000);
@@ -53,7 +57,7 @@ char *sr_samplerate_string(uint64_t samplerate)
 
 	if (r < 0) {
 		/* Something went wrong... */
-		free(o);
+		g_free(o);
 		return NULL;
 	}
 
@@ -67,17 +71,21 @@ char *sr_samplerate_string(uint64_t samplerate)
  * E.g. a value of 3000000 would be converted to "3 us", 20000 to "50 ms".
  *
  * @param frequency The frequency in Hz.
- * @return A malloc()ed string representation of the frequency value,
- *         or NULL upon errors. The caller is responsible to free() the memory.
+ *
+ * @return A g_try_malloc()ed string representation of the frequency value,
+ *         or NULL upon errors. The caller is responsible to g_free() the
+ *         memory.
  */
-char *sr_period_string(uint64_t frequency)
+SR_API char *sr_period_string(uint64_t frequency)
 {
 	char *o;
 	int r;
 
-	o = malloc(30 + 1); /* Enough for a uint64_t as string + " ms". */
-	if (!o)
+	/* Allocate enough for a uint64_t as string + " ms". */
+	if (!(o = g_try_malloc0(30 + 1))) {
+		sr_err("strutil: %s: o malloc failed", __func__);
 		return NULL;
+	}
 
 	if (frequency >= SR_GHZ(1))
 		r = snprintf(o, 30, "%" PRIu64 " ns", frequency / 1000000000);
@@ -90,7 +98,7 @@ char *sr_period_string(uint64_t frequency)
 
 	if (r < 0) {
 		/* Something went wrong... */
-		free(o);
+		g_free(o);
 		return NULL;
 	}
 
@@ -102,10 +110,11 @@ char *sr_period_string(uint64_t frequency)
  *
  * @param device TODO
  * @param triggerstring TODO
+ *
  * @return TODO
  */
-char **sr_parse_triggerstring(struct sr_device *device,
-			      const char *triggerstring)
+SR_API char **sr_parse_triggerstring(struct sr_device *device,
+				     const char *triggerstring)
 {
 	GSList *l;
 	struct sr_probe *probe;
@@ -166,8 +175,7 @@ char **sr_parse_triggerstring(struct sr_device *device,
 
 	if (error) {
 		for (i = 0; i < max_probes; i++)
-			if (triggerlist[i])
-				g_free(triggerlist[i]);
+			g_free(triggerlist[i]);
 		g_free(triggerlist);
 		triggerlist = NULL;
 	}
@@ -186,19 +194,19 @@ char **sr_parse_triggerstring(struct sr_device *device,
  * Spaces (but not other whitespace) between value and suffix are allowed.
  *
  * @param sizestring A string containing a (decimal) size value.
- * @return The string's size value as uint64_t.
+ * @param size Pointer to uint64_t which will contain the string's size value.
  *
- * TODO: Error handling.
+ * @return SR_OK upon success, SR_ERR upon errors.
  */
-uint64_t sr_parse_sizestring(const char *sizestring)
+SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size)
 {
-	int multiplier;
-	uint64_t val;
+	int multiplier, done;
 	char *s;
 
-	val = strtoull(sizestring, &s, 10);
+	*size = strtoull(sizestring, &s, 10);
 	multiplier = 0;
-	while (s && *s && multiplier == 0) {
+	done = FALSE;
+	while (s && *s && multiplier == 0 && !done) {
 		switch (*s) {
 		case ' ':
 			break;
@@ -215,15 +223,18 @@ uint64_t sr_parse_sizestring(const char *sizestring)
 			multiplier = SR_GHZ(1);
 			break;
 		default:
-			val = 0;
-			multiplier = -1;
+			done = TRUE;
+			s--;
 		}
 		s++;
 	}
 	if (multiplier > 0)
-		val *= multiplier;
+		*size *= multiplier;
 
-	return val;
+	if (*s && strcasecmp(s, "Hz"))
+		return SR_ERR;
+
+	return SR_OK;
 }
 
 /**
@@ -245,7 +256,7 @@ uint64_t sr_parse_sizestring(const char *sizestring)
  * TODO: picoseconds?
  * TODO: Allow both lower-case and upper-case.
  */
-uint64_t sr_parse_timestring(const char *timestring)
+SR_API uint64_t sr_parse_timestring(const char *timestring)
 {
 	uint64_t time_msec;
 	char *s;
@@ -268,17 +279,16 @@ uint64_t sr_parse_timestring(const char *timestring)
 	return time_msec;
 }
 
-gboolean sr_parse_boolstring(const char *boolstr)
+SR_API gboolean sr_parse_boolstring(const char *boolstr)
 {
 	if (!boolstr)
 		return FALSE;
 
-	if (!g_strcasecmp(boolstr, "true") || 
+	if (!g_strcasecmp(boolstr, "true") ||
 	    !g_strcasecmp(boolstr, "yes") ||
 	    !g_strcasecmp(boolstr, "on") ||
-	    !g_strcasecmp(boolstr, "1")) 
+	    !g_strcasecmp(boolstr, "1"))
 		return TRUE;
 
 	return FALSE;
 }
-