diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-04-11 00:35:53 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-04-11 00:35:53 +0000 |
| commit | 9f925a618faf0730b284c3ba4e3f37078365ab9a (patch) | |
| tree | 5d23ec8d63de1665809fa3fa90a80591f6becdbb | |
| parent | dd4cb8424b10aeb4baf38cdcacc56b553de57edc (diff) | |
The trial period is arguably over - no need for packet-ansi_map.c to
have its own #if 0'ed out definition of dgt_set_t.
svn path=/trunk/; revision=42020
| -rw-r--r-- | asn1/ansi_map/packet-ansi_map-template.c | 10 | ||||
| -rw-r--r-- | epan/dissectors/packet-ansi_map.c | 16 |
2 files changed, 3 insertions, 23 deletions
diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c index e6e80d5148..fb97e57cfd 100644 --- a/asn1/ansi_map/packet-ansi_map-template.c +++ b/asn1/ansi_map/packet-ansi_map-template.c @@ -582,16 +582,6 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ static int dissect_returnData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx); static int dissect_ansi_map_SystemMyTypeCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); -#if 0 -/* Moved to tvbuff.h - * XXX remove after trial period. - */ -typedef struct dgt_set_t -{ - unsigned char out[15]; -} -dgt_set_t; -#endif static dgt_set_t Dgt_tbcd = { { /* 0 1 2 3 4 5 6 7 8 9 a b c d e */ diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index 63e9cfdbf2..f1ca1e293d 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -1370,16 +1370,6 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ static int dissect_returnData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx); static int dissect_ansi_map_SystemMyTypeCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); -#if 0 -/* Moved to tvbuff.h - * XXX remove after trial period. - */ -typedef struct dgt_set_t -{ - unsigned char out[15]; -} -dgt_set_t; -#endif static dgt_set_t Dgt_tbcd = { { /* 0 1 2 3 4 5 6 7 8 9 a b c d e */ @@ -15485,7 +15475,7 @@ dissect_ansi_map_ReturnData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of /*--- End of included file: packet-ansi_map-fn.c ---*/ -#line 3611 "../../asn1/ansi_map/packet-ansi_map-template.c" +#line 3601 "../../asn1/ansi_map/packet-ansi_map-template.c" /* * 6.5.2.dk N.S0013-0 v 1.0,X.S0004-550-E v1.0 2.301 @@ -19331,7 +19321,7 @@ void proto_register_ansi_map(void) { NULL, HFILL }}, /*--- End of included file: packet-ansi_map-hfarr.c ---*/ -#line 5264 "../../asn1/ansi_map/packet-ansi_map-template.c" +#line 5254 "../../asn1/ansi_map/packet-ansi_map-template.c" }; /* List of subtrees */ @@ -19592,7 +19582,7 @@ void proto_register_ansi_map(void) { &ett_ansi_map_ReturnData, /*--- End of included file: packet-ansi_map-ettarr.c ---*/ -#line 5297 "../../asn1/ansi_map/packet-ansi_map-template.c" +#line 5287 "../../asn1/ansi_map/packet-ansi_map-template.c" }; static enum_val_t ansi_map_response_matching_type_values[] = { |