aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2013-11-25 11:23:11 +0000
committerPascal Quantin <pascal.quantin@gmail.com>2013-11-25 11:23:11 +0000
commit402fed459fb3f03c3f6fd2a0fd6649b935904c13 (patch)
treef7d4ffd62c7b63290b521a2accc54ca1d44109ac
parent17e16ae136cc15fbfe7e1eb29f1ee040a4ff959c (diff)
Fix a shadowed declaration error when compiling with gcc 4.3.2
svn path=/trunk/; revision=53562
-rw-r--r--asn1/lpp/lpp.cnf6
-rw-r--r--epan/dissectors/packet-lpp.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/asn1/lpp/lpp.cnf b/asn1/lpp/lpp.cnf
index 00c6be8d31..e7e4bd9afe 100644
--- a/asn1/lpp/lpp.cnf
+++ b/asn1/lpp/lpp.cnf
@@ -255,15 +255,15 @@ PolygonPoints/degreesLongitude DISPLAY=BASE_CUSTOM STRINGS=&lpp_degreesLongitude
}
}
-#.FN_BODY PeriodicalReportingCriteria/reportingInterval VAL_PTR=&index
- guint32 index;
+#.FN_BODY PeriodicalReportingCriteria/reportingInterval VAL_PTR=&idx
+ guint32 idx;
const gchar *interval[10] = {"", ": 1 s", ": 2 s", ": 4 s", ": 8 s", ": 10 s",
": 16 s", ": 20 s", ": 32 s", ": 64 s"};
%(DEFAULT_BODY)s
#.FN_FTR PeriodicalReportingCriteria/reportingInterval
- proto_item_append_text(actx->created_item, "%s", interval[index]);
+ proto_item_append_text(actx->created_item, "%s", interval[idx]);
#.FN_BODY ReportingDuration VAL_PTR = &duration
guint32 duration;
diff --git a/epan/dissectors/packet-lpp.c b/epan/dissectors/packet-lpp.c
index 45acc00a25..6b29f55498 100644
--- a/epan/dissectors/packet-lpp.c
+++ b/epan/dissectors/packet-lpp.c
@@ -8339,18 +8339,18 @@ static const value_string lpp_T_reportingInterval_vals[] = {
static int
dissect_lpp_T_reportingInterval(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 259 "../../asn1/lpp/lpp.cnf"
- guint32 index;
+ guint32 idx;
const gchar *interval[10] = {"", ": 1 s", ": 2 s", ": 4 s", ": 8 s", ": 10 s",
": 16 s", ": 20 s", ": 32 s", ": 64 s"};
offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
- 10, &index, FALSE, 0, NULL);
+ 10, &idx, FALSE, 0, NULL);
#line 266 "../../asn1/lpp/lpp.cnf"
- proto_item_append_text(actx->created_item, "%s", interval[index]);
+ proto_item_append_text(actx->created_item, "%s", interval[idx]);
return offset;