X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=strutil.c;h=ea77f4d90429f1de7fbf4bf6a76035441e8dcf59;hb=1a081ca67d63a0bd933a3d715792d85afd437296;hp=e5278dfe3fda303156eb05b62bc95577f71b4158;hpb=59df0c77e2906323290544ea62801831818ec096;p=libsigrok.git

diff --git a/strutil.c b/strutil.c
index e5278dfe..ea77f4d9 100644
--- a/strutil.c
+++ b/strutil.c
@@ -21,7 +21,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sigrok.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
 /**
  * Convert a numeric samplerate value to its "natural" string representation.
@@ -32,7 +33,7 @@
  * @return A malloc()ed string representation of the samplerate value,
  *         or NULL upon errors. The caller is responsible to free() the memory.
  */
-char *sr_samplerate_string(uint64_t samplerate)
+SR_API char *sr_samplerate_string(uint64_t samplerate)
 {
 	char *o;
 	int r;
@@ -69,7 +70,7 @@ char *sr_samplerate_string(uint64_t samplerate)
  * @return A malloc()ed string representation of the frequency value,
  *         or NULL upon errors. The caller is responsible to free() the memory.
  */
-char *sr_period_string(uint64_t frequency)
+SR_API char *sr_period_string(uint64_t frequency)
 {
 	char *o;
 	int r;
@@ -103,8 +104,8 @@ char *sr_period_string(uint64_t frequency)
  * @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;
@@ -114,7 +115,12 @@ char **sr_parse_triggerstring(struct sr_device *device,
 
 	max_probes = g_slist_length(device->probes);
 	error = FALSE;
-	triggerlist = g_malloc0(max_probes * sizeof(char *));
+
+	if (!(triggerlist = g_try_malloc0(max_probes * sizeof(char *)))) {
+		sr_err("session file: %s: metafile malloc failed", __func__);
+		return NULL;
+	}
+
 	tokens = g_strsplit(triggerstring, ",", max_probes);
 	trigger_types = device->plugin->get_device_info(0, SR_DI_TRIGGER_TYPES);
 	if (trigger_types == NULL)
@@ -138,7 +144,7 @@ char **sr_parse_triggerstring(struct sr_device *device,
 		}
 
 		if (probenum < 1 || probenum > max_probes) {
-			printf("Invalid probe.\n");
+			sr_err("Invalid probe.\n");
 			error = TRUE;
 			break;
 		}
@@ -146,7 +152,7 @@ char **sr_parse_triggerstring(struct sr_device *device,
 		if ((trigger = strchr(tokens[i], '='))) {
 			for (tc = ++trigger; *tc; tc++) {
 				if (strchr(trigger_types, *tc) == NULL) {
-					printf("Unsupported trigger type "
+					sr_err("Unsupported trigger type "
 					       "'%c'\n", *tc);
 					error = TRUE;
 					break;
@@ -160,8 +166,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;
 	}
@@ -180,19 +185,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.
+ * @return SR_OK or error code
  *
- * TODO: Error handling.
  */
-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;
@@ -209,15 +214,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;
+
+	if (*s && strcasecmp(s, "Hz"))
+		return SR_ERR;
 
-	return val;
+	return SR_OK;
 }
 
 /**
@@ -239,7 +247,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;
@@ -261,3 +269,17 @@ uint64_t sr_parse_timestring(const char *timestring)
 
 	return time_msec;
 }
+
+SR_API gboolean sr_parse_boolstring(const char *boolstr)
+{
+	if (!boolstr)
+		return FALSE;
+
+	if (!g_strcasecmp(boolstr, "true") ||
+	    !g_strcasecmp(boolstr, "yes") ||
+	    !g_strcasecmp(boolstr, "on") ||
+	    !g_strcasecmp(boolstr, "1"))
+		return TRUE;
+
+	return FALSE;
+}