diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2012-09-05 12:45:54 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2012-09-05 12:45:54 +0000 |
| commit | e6538311a6e82a5b57e72cc3e5dec0f0bd8b7776 (patch) | |
| tree | 138e24a92f9188edd53b71811ff12af7a5edf7b7 /tools | |
| parent | 881a115a888fd1803d0c978b71c030e4e4a979cc (diff) | |
Replace process_RequestOperation macro by a real function to speedup compilation time
svn path=/trunk/; revision=44779
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/wireshark_gen.py | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py index ad377cf02a..4e398bffb9 100755 --- a/tools/wireshark_gen.py +++ b/tools/wireshark_gen.py @@ -1670,7 +1670,7 @@ void proto_register_giop_@dissector_name@(void) { template_op_delegate_code = """\ if (strcmp(operation, "@opname@") == 0 && (!idlname || strcmp(idlname, \"@interface@\") == 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_@sname@(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); return TRUE; @@ -2047,17 +2047,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_@dissname@(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 */ |