hameg-hmo/yokogawa-dlm: Fix warning about pointer typecast

diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c
index 60731ec46574a35f98f3594d96b523039e55a0a4..de93e74a7438c0919b2ddc4f84f6912a83d96efe 100644 (file)
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -355,7 +355,8 @@ static int scope_state_get_array_option(struct sr_scpi_dev_inst *scpi,
 static int array_float_get(gchar *value, const uint64_t array[][2],
                int array_len, unsigned int *result)
 {
-       int i, pos, e;
+       int i, e;
+       size_t pos;
        uint64_t f;
        float s;
        unsigned int s_int;
@@ -365,8 +366,7 @@ static int array_float_get(gchar *value, const uint64_t array[][2],
        memset(es, 0, sizeof(es));
 
        /* Get index of the separating 'E' character and break up the string. */
-       pos = (int)g_strstr_len(value, strlen(value), "E");
-       pos -= (int)value;
+       pos = strcspn(value, "E");
 
        strncpy(ss, value, pos);
        strncpy(es, &(value[pos+1]), 3);

diff --git a/src/hardware/yokogawa-dlm/protocol.c b/src/hardware/yokogawa-dlm/protocol.c
index 185f9d5c4b7b4944150c70d6a0dbc9a568fb2c49..e63e6357f0cc3a130ec49feaa38706fffb23911c 100644 (file)
--- a/src/hardware/yokogawa-dlm/protocol.c
+++ b/src/hardware/yokogawa-dlm/protocol.c
@@ -372,7 +372,8 @@ static int array_option_get(char *value, const char *(*array)[],
 static int array_float_get(gchar *value, const uint64_t array[][2],
                int array_len, int *result)
 {
-       int i, pos, e;
+       int i, e;
+       size_t pos;
        uint64_t f;
        float s;
        unsigned int s_int;
@@ -382,8 +383,7 @@ static int array_float_get(gchar *value, const uint64_t array[][2],
        memset(es, 0, sizeof(es));
 
        /* Get index of the separating 'E' character and break up the string. */
-       pos = (int)g_strstr_len(value, strlen(value), "E");
-       pos -= (int)value;
+       pos = strcspn(value, "E");
 
        strncpy(ss, value, pos);
        strncpy(es, &(value[pos+1]), 3);