X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=strutil.c;h=cb51b2ab72ae241e42b0f96662bc52f531cedb15;hb=6752905e6be19617d83c48a6db5a20b8e932308b;hp=014c2c2ce16538dbacc1d72bd7276fb73f9c04c1;hpb=bf978d355345a7cc3ae7dc6199cc25952aaa182f;p=libsigrok.git

diff --git a/strutil.c b/strutil.c
index 014c2c2c..cb51b2ab 100644
--- a/strutil.c
+++ b/strutil.c
@@ -175,7 +175,7 @@ SR_API char **sr_parse_triggerstring(struct sr_dev *dev,
 		}
 
 		if (probenum < 1 || probenum > max_probes) {
-			sr_err("strutil: Invalid probe (%d).\n", probenum);
+			sr_err("strutil: Invalid probe (%d).", probenum);
 			error = TRUE;
 			break;
 		}
@@ -184,7 +184,7 @@ SR_API char **sr_parse_triggerstring(struct sr_dev *dev,
 			for (tc = ++trigger; *tc; tc++) {
 				if (strchr(trigger_types, *tc) == NULL) {
 					sr_err("strutil: Unsupported trigger "
-					       "type '%c'.\n", *tc);
+					       "type '%c'.", *tc);
 					error = TRUE;
 					break;
 				}
@@ -306,10 +306,10 @@ 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"))
+	if (!g_ascii_strncasecmp(boolstr, "true", 4) ||
+	    !g_ascii_strncasecmp(boolstr, "yes", 3) ||
+	    !g_ascii_strncasecmp(boolstr, "on", 2) ||
+	    !g_ascii_strncasecmp(boolstr, "1", 1))
 		return TRUE;
 
 	return FALSE;