X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fanalog.c;h=6511de5155728d97d5843a9ae7a92ef57150e106;hb=755793e991c4d429f99254f23008bfddb89d8e00;hp=7dc7c3d00383b10be8815c63f13663e41fd0d749;hpb=405b9c10eb15667e23c2c0bba7009c449834ccd9;p=libsigrok.git diff --git a/src/analog.c b/src/analog.c index 7dc7c3d0..6511de51 100644 --- a/src/analog.c +++ b/src/analog.c @@ -174,8 +174,7 @@ SR_PRIV int sr_analog_init(struct sr_datafeed_analog *analog, SR_API int sr_analog_to_float(const struct sr_datafeed_analog *analog, float *outbuf) { - float offset; - unsigned int b, i, count; + unsigned int b, count; gboolean bigendian; if (!analog || !(analog->data) || !(analog->meaning) @@ -275,7 +274,7 @@ SR_API int sr_analog_to_float(const struct sr_datafeed_analog *analog, /* The data is already in the right format. */ memcpy(outbuf, analog->data, count * sizeof(float)); } else { - for (i = 0; i < count; i += analog->encoding->unitsize) { + for (unsigned int i = 0; i < count; i += analog->encoding->unitsize) { for (b = 0; b < analog->encoding->unitsize; b++) { if (analog->encoding->is_bigendian == bigendian) ((uint8_t *)outbuf)[i + b] = @@ -287,7 +286,7 @@ SR_API int sr_analog_to_float(const struct sr_datafeed_analog *analog, if (analog->encoding->scale.p != 1 || analog->encoding->scale.q != 1) outbuf[i] = (outbuf[i] * analog->encoding->scale.p) / analog->encoding->scale.q; - offset = ((float)analog->encoding->offset.p / (float)analog->encoding->offset.q); + float offset = ((float)analog->encoding->offset.p / (float)analog->encoding->offset.q); outbuf[i] += offset; } }