diff options
-rw-r--r-- | asn1/h450-ros/packet-h450-ros-template.c | 1 | ||||
-rw-r--r-- | asn1/q932-ros/packet-q932-ros-template.c | 1 | ||||
-rw-r--r-- | asn1/x411/packet-x411-template.c | 1 | ||||
-rw-r--r-- | asn1/x509if/packet-x509if-template.c | 1 | ||||
-rw-r--r-- | epan/diam_dict.l | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-h450-ros.c | 11 | ||||
-rw-r--r-- | epan/dissectors/packet-q932-ros.c | 11 | ||||
-rw-r--r-- | epan/dissectors/packet-x411.c | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-x509if.c | 13 | ||||
-rw-r--r-- | epan/ftypes/ftype-string.c | 1 |
10 files changed, 22 insertions, 32 deletions
diff --git a/asn1/h450-ros/packet-h450-ros-template.c b/asn1/h450-ros/packet-h450-ros-template.c index 7ed5dde7c7..563d357825 100644 --- a/asn1/h450-ros/packet-h450-ros-template.c +++ b/asn1/h450-ros/packet-h450-ros-template.c @@ -31,7 +31,6 @@ #include <epan/packet.h> #include <epan/strutil.h> -#include <epan/emem.h> #include <epan/asn1.h> #include "packet-per.h" diff --git a/asn1/q932-ros/packet-q932-ros-template.c b/asn1/q932-ros/packet-q932-ros-template.c index 30805fece4..af1b6c2612 100644 --- a/asn1/q932-ros/packet-q932-ros-template.c +++ b/asn1/q932-ros/packet-q932-ros-template.c @@ -31,7 +31,6 @@ #include <epan/packet.h> #include <epan/strutil.h> -#include <epan/emem.h> #include <epan/asn1.h> #include "packet-ber.h" diff --git a/asn1/x411/packet-x411-template.c b/asn1/x411/packet-x411-template.c index 4f551e1078..0a5bd4800f 100644 --- a/asn1/x411/packet-x411-template.c +++ b/asn1/x411/packet-x411-template.c @@ -48,7 +48,6 @@ #include "packet-x509sat.h" #include "packet-x411.h" -#include <epan/emem.h> #include <epan/strutil.h> #define PNAME "X.411 Message Transfer Service" diff --git a/asn1/x509if/packet-x509if-template.c b/asn1/x509if/packet-x509if-template.c index 0cc50c0271..9f423979af 100644 --- a/asn1/x509if/packet-x509if-template.c +++ b/asn1/x509if/packet-x509if-template.c @@ -39,7 +39,6 @@ #include "packet-dap.h" #include "packet-x509if.h" #include "packet-x509sat.h" -#include <epan/emem.h> #include <epan/strutil.h> #define PNAME "X.509 Information Framework" diff --git a/epan/diam_dict.l b/epan/diam_dict.l index 2b09c12b02..21d42ff0b9 100644 --- a/epan/diam_dict.l +++ b/epan/diam_dict.l @@ -56,7 +56,6 @@ #include <errno.h> #include <stdlib.h> #include <stdarg.h> -#include "emem.h" #include "diam_dict.h" #include "diam_dict_lex.h" #include <wsutil/file_util.h> diff --git a/epan/dissectors/packet-h450-ros.c b/epan/dissectors/packet-h450-ros.c index 24ed803318..83b3a6e261 100644 --- a/epan/dissectors/packet-h450-ros.c +++ b/epan/dissectors/packet-h450-ros.c @@ -39,7 +39,6 @@ #include <epan/packet.h> #include <epan/strutil.h> -#include <epan/emem.h> #include <epan/asn1.h> #include "packet-per.h" @@ -75,7 +74,7 @@ static int hf_h450_ros_returnResultProblem = -1; /* ReturnResultProblem */ static int hf_h450_ros_returnErrorProblem = -1; /* ReturnErrorProblem */ /*--- End of included file: packet-h450-ros-hf.c ---*/ -#line 46 "packet-h450-ros-template.c" +#line 45 "packet-h450-ros-template.c" /* Initialize the subtree pointers */ @@ -91,7 +90,7 @@ static gint ett_h450_ros_Reject = -1; static gint ett_h450_ros_T_problem = -1; /*--- End of included file: packet-h450-ros-ett.c ---*/ -#line 49 "packet-h450-ros-template.c" +#line 48 "packet-h450-ros-template.c" /* Preferences */ @@ -570,7 +569,7 @@ dissect_h450_ros_ROS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr /*--- End of included file: packet-h450-ros-fn.c ---*/ -#line 76 "packet-h450-ros-template.c" +#line 75 "packet-h450-ros-template.c" /*--- proto_register_h450_ros -----------------------------------------------*/ void proto_register_h450_ros(void) { @@ -662,7 +661,7 @@ void proto_register_h450_ros(void) { "h450_ros.ReturnErrorProblem", HFILL }}, /*--- End of included file: packet-h450-ros-hfarr.c ---*/ -#line 83 "packet-h450-ros-template.c" +#line 82 "packet-h450-ros-template.c" }; /* List of subtrees */ @@ -680,7 +679,7 @@ void proto_register_h450_ros(void) { &ett_h450_ros_T_problem, /*--- End of included file: packet-h450-ros-ettarr.c ---*/ -#line 88 "packet-h450-ros-template.c" +#line 87 "packet-h450-ros-template.c" }; /* Register protocol and dissector */ diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c index f5cb93c36c..43a5d8356a 100644 --- a/epan/dissectors/packet-q932-ros.c +++ b/epan/dissectors/packet-q932-ros.c @@ -39,7 +39,6 @@ #include <epan/packet.h> #include <epan/strutil.h> -#include <epan/emem.h> #include <epan/asn1.h> #include "packet-ber.h" @@ -79,7 +78,7 @@ static int hf_q932_ros_present = -1; /* INTEGER */ static int hf_q932_ros_InvokeId_present = -1; /* InvokeId_present */ /*--- End of included file: packet-q932-ros-hf.c ---*/ -#line 46 "packet-q932-ros-template.c" +#line 45 "packet-q932-ros-template.c" /* Initialize the subtree pointers */ @@ -97,7 +96,7 @@ static gint ett_q932_ros_T_problem = -1; static gint ett_q932_ros_InvokeId = -1; /*--- End of included file: packet-q932-ros-ett.c ---*/ -#line 49 "packet-q932-ros-template.c" +#line 48 "packet-q932-ros-template.c" /* Preferences */ @@ -666,7 +665,7 @@ static int dissect_ROS_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree /*--- End of included file: packet-q932-ros-fn.c ---*/ -#line 64 "packet-q932-ros-template.c" +#line 63 "packet-q932-ros-template.c" /*--- dissect_q932_ros -----------------------------------------------------*/ static int dissect_q932_ros(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -781,7 +780,7 @@ void proto_register_q932_ros(void) { "q932_ros.InvokeId_present", HFILL }}, /*--- End of included file: packet-q932-ros-hfarr.c ---*/ -#line 78 "packet-q932-ros-template.c" +#line 77 "packet-q932-ros-template.c" }; /* List of subtrees */ @@ -801,7 +800,7 @@ void proto_register_q932_ros(void) { &ett_q932_ros_InvokeId, /*--- End of included file: packet-q932-ros-ettarr.c ---*/ -#line 83 "packet-q932-ros-template.c" +#line 82 "packet-q932-ros-template.c" }; /* Register protocol and dissector */ diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c index 4c2a2bbf65..c9499d9953 100644 --- a/epan/dissectors/packet-x411.c +++ b/epan/dissectors/packet-x411.c @@ -56,7 +56,6 @@ #include "packet-x509sat.h" #include "packet-x411.h" -#include <epan/emem.h> #include <epan/strutil.h> #define PNAME "X.411 Message Transfer Service" @@ -607,7 +606,7 @@ static int hf_x411_G3FacsimileNonBasicParameters_jpeg = -1; static int hf_x411_G3FacsimileNonBasicParameters_processable_mode_26 = -1; /*--- End of included file: packet-x411-hf.c ---*/ -#line 85 "packet-x411-template.c" +#line 84 "packet-x411-template.c" /* Initialize the subtree pointers */ static gint ett_x411 = -1; @@ -785,7 +784,7 @@ static gint ett_x411_SecurityCategories = -1; static gint ett_x411_SecurityCategory = -1; /*--- End of included file: packet-x411-ett.c ---*/ -#line 95 "packet-x411-template.c" +#line 94 "packet-x411-template.c" /* Dissector tables */ static dissector_table_t x411_extension_dissector_table; @@ -6974,7 +6973,7 @@ static void dissect_SecurityClassification_PDU(tvbuff_t *tvb _U_, packet_info *p /*--- End of included file: packet-x411-fn.c ---*/ -#line 103 "packet-x411-template.c" +#line 102 "packet-x411-template.c" char* x411_get_last_oraddress() { return oraddress; } @@ -9162,7 +9161,7 @@ void proto_register_x411(void) { "", HFILL }}, /*--- End of included file: packet-x411-hfarr.c ---*/ -#line 238 "packet-x411-template.c" +#line 237 "packet-x411-template.c" }; /* List of subtrees */ @@ -9342,7 +9341,7 @@ void proto_register_x411(void) { &ett_x411_SecurityCategory, /*--- End of included file: packet-x411-ettarr.c ---*/ -#line 250 "packet-x411-template.c" +#line 249 "packet-x411-template.c" }; module_t *x411_module; @@ -9532,7 +9531,7 @@ void proto_reg_handoff_x411(void) { /*--- End of included file: packet-x411-dis-tab.c ---*/ -#line 282 "packet-x411-template.c" +#line 281 "packet-x411-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index 632222a2f0..71a3dae2e3 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -47,7 +47,6 @@ #include "packet-dap.h" #include "packet-x509if.h" #include "packet-x509sat.h" -#include <epan/emem.h> #include <epan/strutil.h> #define PNAME "X.509 Information Framework" @@ -218,7 +217,7 @@ static int hf_x509if_AllowedSubset_oneLevel = -1; static int hf_x509if_AllowedSubset_wholeSubtree = -1; /*--- End of included file: packet-x509if-hf.c ---*/ -#line 54 "packet-x509if-template.c" +#line 53 "packet-x509if-template.c" /* Initialize the subtree pointers */ @@ -299,7 +298,7 @@ static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_AttributeType = -1; static gint ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString = -1; /*--- End of included file: packet-x509if-ett.c ---*/ -#line 57 "packet-x509if-template.c" +#line 56 "packet-x509if-template.c" static const char *object_identifier_id; static proto_tree *top_of_dn = NULL; @@ -2084,7 +2083,7 @@ static void dissect_HierarchyBelow_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ /*--- End of included file: packet-x509if-fn.c ---*/ -#line 80 "packet-x509if-template.c" +#line 79 "packet-x509if-template.c" const char * x509if_get_last_dn(void) { @@ -2750,7 +2749,7 @@ void proto_register_x509if(void) { "", HFILL }}, /*--- End of included file: packet-x509if-hfarr.c ---*/ -#line 125 "packet-x509if-template.c" +#line 124 "packet-x509if-template.c" }; /* List of subtrees */ @@ -2833,7 +2832,7 @@ void proto_register_x509if(void) { &ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString, /*--- End of included file: packet-x509if-ettarr.c ---*/ -#line 130 "packet-x509if-template.c" +#line 129 "packet-x509if-template.c" }; /* Register protocol */ @@ -2889,6 +2888,6 @@ void proto_reg_handoff_x509if(void) { /*--- End of included file: packet-x509if-dis-tab.c ---*/ -#line 149 "packet-x509if-template.c" +#line 148 "packet-x509if-template.c" } diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c index 5cfe5caa94..4a41c55dcf 100644 --- a/epan/ftypes/ftype-string.c +++ b/epan/ftypes/ftype-string.c @@ -26,7 +26,6 @@ #include <ftypes-int.h> #include <string.h> -#include <epan/emem.h> #ifdef HAVE_LIBPCRE #include <pcre.h> |