aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2010-01-11 13:39:09 +0000
committerstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2010-01-11 13:39:09 +0000
commit461e7da65c6d9d921545c48a6a2d11cf640f5a85 (patch)
treee267d5428ee32888421ddff46f3d7517ae1e9359
parent2330736a04b5504ed5f406a322b7fa413831db22 (diff)
Small cleanup in conformation file.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31495 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r--asn1/s4406/s4406.cnf7
-rw-r--r--epan/dissectors/packet-s4406.c4
2 files changed, 2 insertions, 9 deletions
diff --git a/asn1/s4406/s4406.cnf b/asn1/s4406/s4406.cnf
index 8324665533..8d5abcec1d 100644
--- a/asn1/s4406/s4406.cnf
+++ b/asn1/s4406/s4406.cnf
@@ -3,16 +3,9 @@
# $Id$
-#.MODULE_IMPORT
-ProbeSubmissionEnvelope x411
-InformationObject x420
-
#.IMPORT ../x411/x411-exp.cnf
#.IMPORT ../x420/x420-exp.cnf
-
-#.END
-
#.OMIT_ASSIGNMENT
ID
MM
diff --git a/epan/dissectors/packet-s4406.c b/epan/dissectors/packet-s4406.c
index ec1e293436..19e358e838 100644
--- a/epan/dissectors/packet-s4406.c
+++ b/epan/dissectors/packet-s4406.c
@@ -621,7 +621,7 @@ static const value_string s4406_PrimaryPrecedence_vals[] = {
static int
dissect_s4406_PrimaryPrecedence(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 108 "s4406.cnf"
+#line 101 "s4406.cnf"
int precedence = -1;
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
&precedence);
@@ -651,7 +651,7 @@ static const value_string s4406_CopyPrecedence_vals[] = {
static int
dissect_s4406_CopyPrecedence(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 116 "s4406.cnf"
+#line 109 "s4406.cnf"
int precedence = -1;
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
&precedence);