]> sigrok.org Git - libsigrok.git/commitdiff
sr_analog_to_float(): Fix a compiler warning (-Wshadow).
authorUwe Hermann <redacted>
Wed, 16 May 2018 20:46:34 +0000 (22:46 +0200)
committerUwe Hermann <redacted>
Wed, 16 May 2018 20:48:35 +0000 (22:48 +0200)
  src/analog.c: In function ‘sr_analog_to_float’:
  src/analog.c:194:9: warning: declaration of ‘offset’ shadows a previous local [-Wshadow]
   float offset = analog->encoding->offset.p / (float)analog->encoding->offset.q;
         ^~~~~~
  src/analog.c:177:8: note: shadowed declaration is here
  float offset;
        ^~~~~~

src/analog.c

index 7dc7c3d00383b10be8815c63f13663e41fd0d749..9b2977e9b5d4948696c96afa16ce360d7d330fd0 100644 (file)
@@ -174,7 +174,6 @@ 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;
        gboolean bigendian;
 
@@ -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;
                }
        }