]> sigrok.org Git - libsigrok.git/blobdiff - strutil.c
sr: fx2lafw: Forgot to add (C) line to fx2lafw.h in recent commit.
[libsigrok.git] / strutil.c
index 014c2c2ce16538dbacc1d72bd7276fb73f9c04c1..cb51b2ab72ae241e42b0f96662bc52f531cedb15 100644 (file)
--- 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;