Apparently one of our major global headers must include emem.h, because I just

found a bunch more asn1 dissectors using emem without ever directly including
the header. Convert those to wmem as well, which involves add a number of
#include directives since dissectors do *not* automatically pull in the wmem
headers.

svn path=/trunk/; revision=50066

1 files changed, 16 insertions, 15 deletions

diff --git a/epan/dissectors/packet-h450-ros.c b/epan/dissectors/packet-h450-ros.c
index a4a57fd107..2115067f0f 100644
--- a/epan/dissectors/packet-h450-ros.c
+++ b/epan/dissectors/packet-h450-ros.c
@@ -37,6 +37,7 @@
 #include <epan/strutil.h>
 #include <epan/asn1.h>
 #include <epan/expert.h>
+#include <epan/wmem/wmem.h>
 
 #include "packet-per.h"
 
@@ -71,7 +72,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 42 "../../asn1/h450-ros/packet-h450-ros-template.c"
+#line 43 "../../asn1/h450-ros/packet-h450-ros-template.c"
 
 /* Initialize the subtree pointers */
 
@@ -87,7 +88,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 45 "../../asn1/h450-ros/packet-h450-ros-template.c"
+#line 46 "../../asn1/h450-ros/packet-h450-ros-template.c"
 
 static expert_field ei_ros_undecoded = EI_INIT;
 
@@ -226,11 +227,11 @@ dissect_h450_ros_Invoke(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
   if (!arg_handle || 
       !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(arg_handle)))) {
     if (actx->rose_ctx->d.code == 0)
-      descr = ep_strdup_printf("INV: %d", actx->rose_ctx->d.code_local);
+      descr = wmem_strdup_printf(wmem_packet_scope(), "INV: %d", actx->rose_ctx->d.code_local);
     else if (actx->rose_ctx->d.code == 1)
-      descr = ep_strdup_printf("INV: %s", actx->rose_ctx->d.code_global);
+      descr = wmem_strdup_printf(wmem_packet_scope(), "INV: %s", actx->rose_ctx->d.code_global);
   } else {
-    descr = ep_strdup_printf("INV:");
+    descr = wmem_strdup_printf(wmem_packet_scope(), "INV:");
   }
 
   if (actx->rose_ctx->apdu_depth >= 0)
@@ -309,11 +310,11 @@ dissect_h450_ros_ReturnResult(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
   if (!res_handle || 
       !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(res_handle)))) {
     if (actx->rose_ctx->d.code == 0)
-      descr = ep_strdup_printf("RES: %d", actx->rose_ctx->d.code_local);
+      descr = wmem_strdup_printf(wmem_packet_scope(), "RES: %d", actx->rose_ctx->d.code_local);
     else if (actx->rose_ctx->d.code == 1)
-      descr = ep_strdup_printf("RES: %s", actx->rose_ctx->d.code_global);
+      descr = wmem_strdup_printf(wmem_packet_scope(), "RES: %s", actx->rose_ctx->d.code_global);
   } else {
-    descr = ep_strdup_printf("RES:");
+    descr = wmem_strdup_printf(wmem_packet_scope(), "RES:");
   }
 
   if (actx->rose_ctx->apdu_depth >= 0)
@@ -379,11 +380,11 @@ dissect_h450_ros_ReturnError(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
   if (!err_handle || 
       !proto_is_protocol_enabled(find_protocol_by_id(dissector_handle_get_protocol_index(err_handle)))) {
     if (actx->rose_ctx->d.code == 0)
-      descr = ep_strdup_printf("ERR: %d", actx->rose_ctx->d.code_local);
+      descr = wmem_strdup_printf(wmem_packet_scope(), "ERR: %d", actx->rose_ctx->d.code_local);
     else if (actx->rose_ctx->d.code == 1)
-      descr = ep_strdup_printf("ERR: %s", actx->rose_ctx->d.code_global);
+      descr = wmem_strdup_printf(wmem_packet_scope(), "ERR: %s", actx->rose_ctx->d.code_global);
   } else {
-    descr = ep_strdup_printf("ERR:");
+    descr = wmem_strdup_printf(wmem_packet_scope(), "ERR:");
   }
 
   if (actx->rose_ctx->apdu_depth >= 0)
@@ -536,7 +537,7 @@ dissect_h450_ros_Reject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
                                    ett_h450_ros_Reject, Reject_sequence);
 
 #line 11 "../../asn1/ros/ros-rej.cnf"
-  descr = ep_strdup_printf("REJ: %s", problem_str);
+  descr = wmem_strdup_printf(wmem_packet_scope(), "REJ: %s", problem_str);
 
   if (actx->rose_ctx->apdu_depth >= 0)
     proto_item_append_text(proto_item_get_parent_nth(proto_tree_get_parent(tree), actx->rose_ctx->apdu_depth), "  %s", descr);
@@ -580,7 +581,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 74 "../../asn1/h450-ros/packet-h450-ros-template.c"
+#line 75 "../../asn1/h450-ros/packet-h450-ros-template.c"
 
 /*--- proto_register_h450_ros -----------------------------------------------*/
 void proto_register_h450_ros(void) {
@@ -672,7 +673,7 @@ void proto_register_h450_ros(void) {
         "ReturnErrorProblem", HFILL }},
 
 /*--- End of included file: packet-h450-ros-hfarr.c ---*/
-#line 81 "../../asn1/h450-ros/packet-h450-ros-template.c"
+#line 82 "../../asn1/h450-ros/packet-h450-ros-template.c"
   };
 
   /* List of subtrees */
@@ -690,7 +691,7 @@ void proto_register_h450_ros(void) {
     &ett_h450_ros_T_problem,
 
 /*--- End of included file: packet-h450-ros-ettarr.c ---*/
-#line 86 "../../asn1/h450-ros/packet-h450-ros-template.c"
+#line 87 "../../asn1/h450-ros/packet-h450-ros-template.c"
   };
 
   static ei_register_info ei[] = {