X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=strutil.c;h=e63f12e18e9dfb8a4e8b6dd371c03c4453a6a4f2;hb=4711724141f9073af8b2493c3fc6a643d5c77cbe;hp=6c6538446eb84e4090beb05dcf2402c77908ac42;hpb=9e4f8cf93b465fb34b35b083935f45ba5427045e;p=libsigrok.git

diff --git a/strutil.c b/strutil.c
index 6c653844..e63f12e1 100644
--- a/strutil.c
+++ b/strutil.c
@@ -25,14 +25,9 @@
 #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)
+/** @cond PRIVATE */
+#define LOG_PREFIX "strutil"
+/** @endcond */
 
 /**
  * @file
@@ -49,6 +44,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
@@ -61,7 +58,7 @@
  *
  * @since 0.3.0
  */
-SR_API int sr_atol(const char *str, long *ret)
+SR_PRIV int sr_atol(const char *str, long *ret)
 {
 	long tmp;
 	char *endptr = NULL;
@@ -80,6 +77,8 @@ SR_API 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
@@ -92,7 +91,7 @@ SR_API int sr_atol(const char *str, long *ret)
  *
  * @since 0.3.0
  */
-SR_API int sr_atoi(const char *str, int *ret)
+SR_PRIV int sr_atoi(const char *str, int *ret)
 {
 	long tmp;
 
@@ -109,6 +108,8 @@ SR_API 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
@@ -121,7 +122,7 @@ SR_API int sr_atoi(const char *str, int *ret)
  *
  * @since 0.3.0
  */
-SR_API int sr_atod(const char *str, double *ret)
+SR_PRIV int sr_atod(const char *str, double *ret)
 {
 	double tmp;
 	char *endptr = NULL;
@@ -140,6 +141,8 @@ SR_API 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
@@ -152,7 +155,7 @@ SR_API int sr_atod(const char *str, double *ret)
  *
  * @since 0.3.0
  */
-SR_API int sr_atof(const char *str, float *ret)
+SR_PRIV int sr_atof(const char *str, float *ret)
 {
 	double tmp;
 
@@ -168,6 +171,49 @@ SR_API 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.
@@ -182,6 +228,8 @@ SR_API int sr_atof(const char *str, float *ret)
  * @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.
+ *
+ * @since 0.2.0
  */
 SR_API char *sr_si_string_u64(uint64_t x, const char *unit)
 {
@@ -191,7 +239,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 +247,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))
@@ -222,6 +270,8 @@ SR_API char *sr_si_string_u64(uint64_t x, const char *unit)
  * @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.
+ *
+ * @since 0.1.0
  */
 SR_API char *sr_samplerate_string(uint64_t samplerate)
 {
@@ -239,6 +289,8 @@ SR_API char *sr_samplerate_string(uint64_t samplerate)
  * @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.
+ *
+ * @since 0.1.0
  */
 SR_API char *sr_period_string(uint64_t frequency)
 {
@@ -282,6 +334,8 @@ SR_API char *sr_period_string(uint64_t frequency)
  * @return A g_try_malloc()ed string representation of the voltage value,
  *         or NULL upon errors. The caller is responsible to g_free() the
  *         memory.
+ *
+ * @since 0.2.0
  */
 SR_API char *sr_voltage_string(uint64_t v_p, uint64_t v_q)
 {
@@ -316,9 +370,9 @@ SR_API char *sr_voltage_string(uint64_t v_p, uint64_t v_q)
  *            intended. Must not be NULL. Also, sdi->driver and
  *            sdi->driver->info_get must not be NULL.
  * @param triggerstring The string containing the trigger specification for
- *        one or more probes of this device. Entries for multiple probes are
+ *        one or more channels of this device. Entries for multiple channels are
  *        comma-separated. Triggers are specified in the form key=value,
- *        where the key is a probe number (or probe name) and the value is
+ *        where the key is a channel number (or channel name) and the value is
  *        the requested trigger type. Valid trigger types currently
  *        include 'r' (rising edge), 'f' (falling edge), 'c' (any pin value
  *        change), '0' (low value), or '1' (high value).
@@ -326,27 +380,29 @@ SR_API char *sr_voltage_string(uint64_t v_p, uint64_t v_q)
  *
  * @return Pointer to a list of trigger types (strings), or NULL upon errors.
  *         The pointer list (if non-NULL) has as many entries as the
- *         respective device has probes (all physically available probes,
+ *         respective device has channels (all physically available channels,
  *         not just enabled ones). Entries of the list which don't have
  *         a trigger value set in 'triggerstring' are NULL, the other entries
  *         contain the respective trigger type which is requested for the
- *         respective probe (e.g. "r", "c", and so on).
+ *         respective channel (e.g. "r", "c", and so on).
+ *
+ * @since 0.2.0
  */
 SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi,
 				     const char *triggerstring)
 {
 	GSList *l;
 	GVariant *gvar;
-	struct sr_probe *probe;
-	int max_probes, probenum, i;
+	struct sr_channel *ch;
+	int max_channels, channelnum, i;
 	char **tokens, **triggerlist, *trigger, *tc;
 	const char *trigger_types;
 	gboolean error;
 
-	max_probes = g_slist_length(sdi->probes);
+	max_channels = g_slist_length(sdi->channels);
 	error = FALSE;
 
-	if (!(triggerlist = g_try_malloc0(max_probes * sizeof(char *)))) {
+	if (!(triggerlist = g_try_malloc0(max_channels * sizeof(char *)))) {
 		sr_err("%s: triggerlist malloc failed", __func__);
 		return NULL;
 	}
@@ -358,21 +414,21 @@ SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi,
 	}
 	trigger_types = g_variant_get_string(gvar, NULL);
 
-	tokens = g_strsplit(triggerstring, ",", max_probes);
+	tokens = g_strsplit(triggerstring, ",", max_channels);
 	for (i = 0; tokens[i]; i++) {
-		probenum = -1;
-		for (l = sdi->probes; l; l = l->next) {
-			probe = (struct sr_probe *)l->data;
-			if (probe->enabled
-				&& !strncmp(probe->name, tokens[i],
-					strlen(probe->name))) {
-				probenum = probe->index;
+		channelnum = -1;
+		for (l = sdi->channels; l; l = l->next) {
+			ch = (struct sr_channel *)l->data;
+			if (ch->enabled
+				&& !strncmp(ch->name, tokens[i],
+					strlen(ch->name))) {
+				channelnum = ch->index;
 				break;
 			}
 		}
 
-		if (probenum < 0 || probenum >= max_probes) {
-			sr_err("Invalid probe.");
+		if (channelnum < 0 || channelnum >= max_channels) {
+			sr_err("Invalid channel.");
 			error = TRUE;
 			break;
 		}
@@ -387,14 +443,14 @@ SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi,
 				}
 			}
 			if (!error)
-				triggerlist[probenum] = g_strdup(trigger);
+				triggerlist[channelnum] = g_strdup(trigger);
 		}
 	}
 	g_strfreev(tokens);
 	g_variant_unref(gvar);
 
 	if (error) {
-		for (i = 0; i < max_probes; i++)
+		for (i = 0; i < max_channels; i++)
 			g_free(triggerlist[i]);
 		g_free(triggerlist);
 		triggerlist = NULL;
@@ -417,19 +473,26 @@ SR_API char **sr_parse_triggerstring(const struct sr_dev_inst *sdi,
  * @param size Pointer to uint64_t which will contain the string's size value.
  *
  * @return SR_OK upon success, SR_ERR upon errors.
+ *
+ * @since 0.1.0
  */
 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 +511,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;
@@ -474,6 +540,8 @@ SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size)
  * @todo Add support for "m" (minutes) and others.
  * @todo Add support for picoseconds?
  * @todo Allow both lower-case and upper-case? If no, document it.
+ *
+ * @since 0.1.0
  */
 SR_API uint64_t sr_parse_timestring(const char *timestring)
 {
@@ -500,6 +568,7 @@ SR_API uint64_t sr_parse_timestring(const char *timestring)
 	return time_msec;
 }
 
+/** @since 0.1.0 */
 SR_API gboolean sr_parse_boolstring(const char *boolstr)
 {
 	if (!boolstr)
@@ -514,6 +583,7 @@ SR_API gboolean sr_parse_boolstring(const char *boolstr)
 	return FALSE;
 }
 
+/** @since 0.2.0 */
 SR_API int sr_parse_period(const char *periodstr, uint64_t *p, uint64_t *q)
 {
 	char *s;
@@ -546,7 +616,7 @@ SR_API int sr_parse_period(const char *periodstr, uint64_t *p, uint64_t *q)
 	return SR_OK;
 }
 
-
+/** @since 0.2.0 */
 SR_API int sr_parse_voltage(const char *voltstr, uint64_t *p, uint64_t *q)
 {
 	char *s;