aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2011-04-05 15:49:56 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2011-04-05 15:49:56 +0000
commitc13f84b3455db5c177dc88969cef93129adbce38 (patch)
treec585e62930b585b6d36c35719f059aafbf75c85b
parent909a1663432c6e6df04ff81b83e1054fe5b9ede5 (diff)
Compile fix: camel_obj_id -> obj_id.
svn path=/trunk/; revision=36475
-rw-r--r--asn1/inap/inap.cnf2
-rw-r--r--epan/dissectors/packet-inap.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/asn1/inap/inap.cnf b/asn1/inap/inap.cnf
index db0b462ac3..784ad90659 100644
--- a/asn1/inap/inap.cnf
+++ b/asn1/inap/inap.cnf
@@ -213,7 +213,7 @@ static const inap_err_t inap_err_tab[] = {
/* FIX ME */
#.FN_HDR ExtensionField
- camel_obj_id = NULL;
+ obj_id = NULL;
#.FN_PARS Code/global FN_VARIANT = _str VAL_PTR = &obj_id
diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c
index 9c6b0a912f..f2c8a05b78 100644
--- a/epan/dissectors/packet-inap.c
+++ b/epan/dissectors/packet-inap.c
@@ -1537,7 +1537,7 @@ static const ber_sequence_t ExtensionField_sequence[] = {
static int
dissect_inap_ExtensionField(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 216 "inap.cnf"
- camel_obj_id = NULL;
+ obj_id = NULL;
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,