X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fstrutil.c;h=d817e642d8f1cb9dfb44292c9ea0d8acf11f73af;hb=510aa8281f19b6312163ff2f09d6515661889378;hp=050f37bf7090532cc67282e07c10ce2867a985b6;hpb=91219afc75c9aa1d0c5e2da5c03343c1e43eb6df;p=libsigrok.git

diff --git a/src/strutil.c b/src/strutil.c
index 050f37bf..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)
 {
@@ -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++);
@@ -420,7 +412,7 @@ SR_API int sr_parse_sizestring(const char *sizestring, uint64_t *size)
 	} else
 		*size += frac_part;
 
-	if (s && *s && strcasecmp(s, "Hz"))
+	if (s && *s && g_ascii_strcasecmp(s, "Hz"))
 		return SR_ERR;
 
 	return SR_OK;
@@ -532,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. */