Replace process_RequestOperation macro by a real function to speedup compilation time

svn path=/trunk/; revision=44779

1 files changed, 26 insertions, 18 deletions

diff --git a/epan/dissectors/packet-cosnaming.c b/epan/dissectors/packet-cosnaming.c
index 554e36dca0..58998823fd 100644
--- a/epan/dissectors/packet-cosnaming.c
+++ b/epan/dissectors/packet-cosnaming.c
@@ -1401,17 +1401,25 @@ start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offs
     return tree;
 }
 
+static void
+process_RequestOperation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, MessageHeader *header, gchar *operation)
+{
+    proto_item *pi;
+    if(header->message_type == Reply) {
+        /* fill-up info column */
+        col_append_fstr(pinfo->cinfo, COL_INFO, " op = %s",operation);
+    };
+    /* fill-up the field */
+    pi=proto_tree_add_string_format_value(ptree,hf_operationrequest,tvb,0,0,operation," %s",operation);
+    PROTO_ITEM_SET_GENERATED(pi);
+}
+
 static gboolean
 dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset, MessageHeader *header, gchar *operation, gchar *idlname)
 {
 
     gboolean stream_is_big_endian;                        /* big endianess */
     proto_tree *tree _U_;
-#define process_RequestOperation(){ \
-		proto_item *pi; \
-     	if(header->message_type == Reply){ col_append_fstr(pinfo->cinfo, COL_INFO, " op = %s",operation); }; /* fill-up info column */ \
-	    pi=proto_tree_add_string_format_value(ptree,hf_operationrequest,tvb,0,0,operation," %s",operation);PROTO_ITEM_SET_GENERATED(pi); /* fill-up the field */ \
-   };
 
     stream_is_big_endian = is_big_endian(header);         /* get endianess  */
 
@@ -1430,7 +1438,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
 
         if (strcmp(operation, "bind") == 0
             && (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
-           process_RequestOperation();  /* fill-up Request_Operation field & info column */
+           process_RequestOperation(tvb, pinfo, ptree, header, operation);  /* fill-up Request_Operation field & info column */
            tree = start_dissecting(tvb, pinfo, ptree, offset);
            decode_CosNaming_NamingContext_bind(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
            return TRUE;
@@ -1438,7 +1446,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
 
         if (strcmp(operation, "rebind") == 0
             && (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
-           process_RequestOperation();  /* fill-up Request_Operation field & info column */
+           process_RequestOperation(tvb, pinfo, ptree, header, operation);  /* fill-up Request_Operation field & info column */
            tree = start_dissecting(tvb, pinfo, ptree, offset);
            decode_CosNaming_NamingContext_rebind(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
            return TRUE;
@@ -1446,7 +1454,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
 
         if (strcmp(operation, "bind_context") == 0
             && (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
-           process_RequestOperation();  /* fill-up Request_Operation field & info column */
+           process_RequestOperation(tvb, pinfo, ptree, header, operation);  /* fill-up Request_Operation field & info column */
            tree = start_dissecting(tvb, pinfo, ptree, offset);
            decode_CosNaming_NamingContext_bind_context(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
            return TRUE;
@@ -1454,7 +1462,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
 
         if (strcmp(operation, "rebind_context") == 0
             && (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
-           process_RequestOperation();  /* fill-up Request_Operation field & info column */
+           process_RequestOperation(tvb, pinfo, ptree, header, operation);  /* fill-up Request_Operation field & info column */
            tree = start_dissecting(tvb, pinfo, ptree, offset);
            decode_CosNaming_NamingContext_rebind_context(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
            return TRUE;
@@ -1462,7 +1470,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
 
         if (strcmp(operation, "resolve") == 0
             && (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
-           process_RequestOperation();  /* fill-up Request_Operation field & info column */
+           process_RequestOperation(tvb, pinfo, ptree, header, operation);  /* fill-up Request_Operation field & info column */
            tree = start_dissecting(tvb, pinfo, ptree, offset);
            decode_CosNaming_NamingContext_resolve(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
            return TRUE;
@@ -1470,7 +1478,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
 
         if (strcmp(operation, "unbind") == 0
             && (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
-           process_RequestOperation();  /* fill-up Request_Operation field & info column */
+           process_RequestOperation(tvb, pinfo, ptree, header, operation);  /* fill-up Request_Operation field & info column */
            tree = start_dissecting(tvb, pinfo, ptree, offset);
            decode_CosNaming_NamingContext_unbind(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
            return TRUE;
@@ -1478,7 +1486,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
 
         if (strcmp(operation, "new_context") == 0
             && (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
-           process_RequestOperation();  /* fill-up Request_Operation field & info column */
+           process_RequestOperation(tvb, pinfo, ptree, header, operation);  /* fill-up Request_Operation field & info column */
            tree = start_dissecting(tvb, pinfo, ptree, offset);
            decode_CosNaming_NamingContext_new_context(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
            return TRUE;
@@ -1486,7 +1494,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
 
         if (strcmp(operation, "bind_new_context") == 0
             && (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
-           process_RequestOperation();  /* fill-up Request_Operation field & info column */
+           process_RequestOperation(tvb, pinfo, ptree, header, operation);  /* fill-up Request_Operation field & info column */
            tree = start_dissecting(tvb, pinfo, ptree, offset);
            decode_CosNaming_NamingContext_bind_new_context(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
            return TRUE;
@@ -1494,7 +1502,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
 
         if (strcmp(operation, "destroy") == 0
             && (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
-           process_RequestOperation();  /* fill-up Request_Operation field & info column */
+           process_RequestOperation(tvb, pinfo, ptree, header, operation);  /* fill-up Request_Operation field & info column */
            tree = start_dissecting(tvb, pinfo, ptree, offset);
            decode_CosNaming_NamingContext_destroy(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
            return TRUE;
@@ -1502,7 +1510,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
 
         if (strcmp(operation, "list") == 0
             && (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
-           process_RequestOperation();  /* fill-up Request_Operation field & info column */
+           process_RequestOperation(tvb, pinfo, ptree, header, operation);  /* fill-up Request_Operation field & info column */
            tree = start_dissecting(tvb, pinfo, ptree, offset);
            decode_CosNaming_NamingContext_list(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
            return TRUE;
@@ -1510,7 +1518,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
 
         if (strcmp(operation, "next_one") == 0
             && (!idlname || strcmp(idlname, "CosNaming/BindingIterator") == 0)) {
-           process_RequestOperation();  /* fill-up Request_Operation field & info column */
+           process_RequestOperation(tvb, pinfo, ptree, header, operation);  /* fill-up Request_Operation field & info column */
            tree = start_dissecting(tvb, pinfo, ptree, offset);
            decode_CosNaming_BindingIterator_next_one(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
            return TRUE;
@@ -1518,7 +1526,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
 
         if (strcmp(operation, "next_n") == 0
             && (!idlname || strcmp(idlname, "CosNaming/BindingIterator") == 0)) {
-           process_RequestOperation();  /* fill-up Request_Operation field & info column */
+           process_RequestOperation(tvb, pinfo, ptree, header, operation);  /* fill-up Request_Operation field & info column */
            tree = start_dissecting(tvb, pinfo, ptree, offset);
            decode_CosNaming_BindingIterator_next_n(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
            return TRUE;
@@ -1526,7 +1534,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
 
         if (strcmp(operation, "destroy") == 0
             && (!idlname || strcmp(idlname, "CosNaming/BindingIterator") == 0)) {
-           process_RequestOperation();  /* fill-up Request_Operation field & info column */
+           process_RequestOperation(tvb, pinfo, ptree, header, operation);  /* fill-up Request_Operation field & info column */
            tree = start_dissecting(tvb, pinfo, ptree, offset);
            decode_CosNaming_BindingIterator_destroy(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
            return TRUE;