diff options
| author | Evan Huus <eapache@gmail.com> | 2013-09-05 12:13:00 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-09-05 12:13:00 +0000 |
| commit | 3b6f55c579c23a12d609e81be0188f6448b832c4 (patch) | |
| tree | cd0af4382b66bb26ec8adb7d82adbdf3578501b7 /epan/dissectors/packet-atn-cpdlc.c | |
| parent | c248e3c5b2d64f25bbec6973b5eea42a55a87bc7 (diff) | |
Convert atn-* dissectors to wmem. No emem in new code please!
svn path=/trunk/; revision=51780
Diffstat (limited to 'epan/dissectors/packet-atn-cpdlc.c')
| -rw-r--r-- | epan/dissectors/packet-atn-cpdlc.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/epan/dissectors/packet-atn-cpdlc.c b/epan/dissectors/packet-atn-cpdlc.c index 3e7ae26ee5..00af473b1c 100644 --- a/epan/dissectors/packet-atn-cpdlc.c +++ b/epan/dissectors/packet-atn-cpdlc.c @@ -62,7 +62,6 @@ #include <epan/conversation.h> #include <epan/dissectors/packet-ber.h> #include <epan/dissectors/packet-per.h> -#include <epan/emem.h> #include <stdio.h> #include <string.h> @@ -697,7 +696,7 @@ static int hf_atn_cpdlc_windSpeedEnglish = -1; /* WindSpeedEnglish */ static int hf_atn_cpdlc_windSpeedMetric = -1; /* WindSpeedMetric */ /*--- End of included file: packet-atn-cpdlc-hf.c ---*/ -#line 87 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 86 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" /*--- Included file: packet-atn-cpdlc-ett.c ---*/ @@ -846,7 +845,7 @@ static gint ett_atn_cpdlc_Winds = -1; static gint ett_atn_cpdlc_WindSpeed = -1; /*--- End of included file: packet-atn-cpdlc-ett.c ---*/ -#line 89 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 88 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" static gint ett_atn_cpdlc = -1; @@ -5283,7 +5282,7 @@ static void dissect_ProtectedAircraftPDUs_PDU(tvbuff_t *tvb _U_, packet_info *pi /*--- End of included file: packet-atn-cpdlc-fn.c ---*/ -#line 92 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 91 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" /* Wireshark ID of CPDLC protocol */ static int proto_atn_cpdlc = -1; @@ -7913,7 +7912,7 @@ void proto_register_atn_cpdlc (void) NULL, HFILL }}, /*--- End of included file: packet-atn-cpdlc-hfarr.c ---*/ -#line 313 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 312 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" }; static gint *ett[] = { @@ -8064,7 +8063,7 @@ void proto_register_atn_cpdlc (void) &ett_atn_cpdlc_WindSpeed, /*--- End of included file: packet-atn-cpdlc-ettarr.c ---*/ -#line 317 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" +#line 316 "../../asn1/atn-cpdlc/packet-atn-cpdlc-template.c" &ett_atn_cpdlc }; @@ -8110,4 +8109,4 @@ void proto_reg_handoff_atn_cpdlc(void) * * vi: set shiftwidth=2 tabstop=2 noexpandtab: * :indentSize=2:tabSize=2:noTabs=false: - */
\ No newline at end of file + */ |