portability: Use g_ascii_strcasecmp() in favor of strcasecmp().

[libsigrok.git] / src / dmm / ut372.c

diff --git a/src/dmm/ut372.c b/src/dmm/ut372.c
index 2de8eec9996d4a0531d69d31072352d4cd83bd4c..d2fd8bc9e8b5643d8996a87d62737b17af868836 100644 (file)
--- a/src/dmm/ut372.c
+++ b/src/dmm/ut372.c
@@ -25,12 +25,12 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <math.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ut372"
 
-uint8_t lookup[] = {
+static const uint8_t lookup[] = {
        0x7B,
        0x60,
        0x5E,
@@ -40,7 +40,7 @@ uint8_t lookup[] = {
        0x3F,
        0x70,
        0x7F,
-       0x7D
+       0x7D,
 };
 
 #define DECIMAL_POINT_MASK 0x80
@@ -51,7 +51,7 @@ uint8_t lookup[] = {
 #define FLAGS2_COUNT_MASK (1 << 1)
 #define FLAGS2_MAX_MASK (1 << 4)
 #define FLAGS2_MIN_MASK (1 << 5)
-#define FLAGS2_AVE_MASK (1 << 6)
+#define FLAGS2_AVG_MASK (1 << 6)
 
 /* Decode a pair of characters into a byte. */
 static uint8_t decode_pair(const uint8_t *buf)
@@ -111,14 +111,14 @@ SR_PRIV int sr_ut372_parse(const uint8_t *buf, float *floatval,
                analog->mqflags |= SR_MQFLAG_MIN;
        if (flags2 & FLAGS2_MAX_MASK)
                analog->mqflags |= SR_MQFLAG_MAX;
-       if (flags2 & FLAGS2_AVE_MASK)
+       if (flags2 & FLAGS2_AVG_MASK)
                analog->mqflags |= SR_MQFLAG_AVG;
 
        value = 0;
        divisor = 1;
 
        for (i = 0; i < 5; i++) {
-               segments = decode_pair(buf + 1 + 2*i);
+               segments = decode_pair(buf + 1 + (2 * i));
                for (j = 0; j < ARRAY_SIZE(lookup); j++) {
                        if (lookup[j] == (segments & ~DECIMAL_POINT_MASK)) {
                                value += j * pow(10, i);