From: Uwe Hermann <redacted>
Date: Wed, 16 May 2018 20:14:22 +0000 (+0200)
Subject: srd_inst_channel_set_all(): Fix a compiler warning (-Wshadow).
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commitdiff_plain;h=3389df7d5d85edc9453c3bd7f3556154152af501

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

  instance.c:266:11: warning: declaration of ‘l’ shadows a previous local [-Wshadow]
     GSList *l = g_slist_nth(di->decoder->channels, i);
             ^
  instance.c:206:9: note: shadowed declaration is here
    GList *l;
           ^
---

diff --git a/instance.c b/instance.c
index 17809be..8d660a4 100644
--- a/instance.c
+++ b/instance.c
@@ -263,11 +263,11 @@ SRD_API int srd_inst_channel_set_all(struct srd_decoder_inst *di,
 	srd_dbg("Final channel map:");
 	num_required_channels = g_slist_length(di->decoder->channels);
 	for (i = 0; i < di->dec_num_channels; i++) {
-		GSList *l = g_slist_nth(di->decoder->channels, i);
-		if (!l)
-			l = g_slist_nth(di->decoder->opt_channels,
+		GSList *ll = g_slist_nth(di->decoder->channels, i);
+		if (!ll)
+			ll = g_slist_nth(di->decoder->opt_channels,
 				i - num_required_channels);
-		pdch = l->data;
+		pdch = ll->data;
 		srd_dbg(" - PD ch idx %d (%s) = input data ch idx %d (%s)", i,
 			pdch->id, new_channelmap[i],
 			(i < num_required_channels) ? "required" : "optional");