From: Uwe Hermann <redacted>
Date: Wed, 16 May 2018 20:46:34 +0000 (+0200)
Subject: sr_analog_to_float(): Fix a compiler warning (-Wshadow).
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=741bcf503dbfa6c282c17ad1898bcbc74cf63dc6;p=libsigrok.git

sr_analog_to_float(): Fix a compiler warning (-Wshadow).

  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;
        ^~~~~~
---

diff --git a/src/analog.c b/src/analog.c
index 7dc7c3d0..9b2977e9 100644
--- a/src/analog.c
+++ b/src/analog.c
@@ -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;
 		}
 	}