From c54e2fd1d513c2fea7a579cae1f0873632738b4f Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sat, 4 May 2002 11:03:18 +0000 Subject: Update the dissectors (by hand) to match the changes to "ethereal_gen.py". svn path=/trunk/; revision=5391 --- plugins/giop/packet-coseventcomm.c | 26 ++++++++++++--------- plugins/giop/packet-cosnaming.c | 46 +++++++++++++++++++++----------------- 2 files changed, 40 insertions(+), 32 deletions(-) (limited to 'plugins') diff --git a/plugins/giop/packet-coseventcomm.c b/plugins/giop/packet-coseventcomm.c index 7988b3560b..fc1dff6326 100644 --- a/plugins/giop/packet-coseventcomm.c +++ b/plugins/giop/packet-coseventcomm.c @@ -167,9 +167,9 @@ static const char CosEventComm_PullConsumer_disconnect_pull_consumer_op[] = "dis * */ -static gboolean decode_user_exception(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation ) { +static gboolean decode_user_exception(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_ ) { - gboolean be; /* big endianess */ + gboolean be _U_; /* big endianess */ @@ -193,7 +193,7 @@ static gboolean decode_user_exception(tvbuff_t *tvb, packet_info *pinfo, proto_t */ -static void decode_CosEventComm_PushConsumer_push(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosEventComm_PushConsumer_push(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -266,7 +266,7 @@ static void decode_CosEventComm_PushConsumer_push(tvbuff_t *tvb, packet_info *pi */ -static void decode_CosEventComm_PushConsumer_disconnect_push_consumer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosEventComm_PushConsumer_disconnect_push_consumer(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -336,7 +336,7 @@ static void decode_CosEventComm_PushConsumer_disconnect_push_consumer(tvbuff_t * */ -static void decode_CosEventComm_PushSupplier_disconnect_push_supplier(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosEventComm_PushSupplier_disconnect_push_supplier(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -406,7 +406,7 @@ static void decode_CosEventComm_PushSupplier_disconnect_push_supplier(tvbuff_t * */ -static void decode_CosEventComm_PullSupplier_pull(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosEventComm_PullSupplier_pull(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -475,7 +475,7 @@ static void decode_CosEventComm_PullSupplier_pull(tvbuff_t *tvb, packet_info *pi */ -static void decode_CosEventComm_PullSupplier_try_pull(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosEventComm_PullSupplier_try_pull(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -550,7 +550,7 @@ static void decode_CosEventComm_PullSupplier_try_pull(tvbuff_t *tvb, packet_info */ -static void decode_CosEventComm_PullSupplier_disconnect_pull_supplier(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosEventComm_PullSupplier_disconnect_pull_supplier(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -620,7 +620,7 @@ static void decode_CosEventComm_PullSupplier_disconnect_pull_supplier(tvbuff_t * */ -static void decode_CosEventComm_PullConsumer_disconnect_pull_consumer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosEventComm_PullConsumer_disconnect_pull_consumer(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -684,7 +684,7 @@ static void decode_CosEventComm_PullConsumer_disconnect_pull_consumer(tvbuff_t * } -static gboolean dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset, MessageHeader *header, gchar *operation, gchar *idlname) { +static gboolean dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset, MessageHeader *header, gchar *operation, gchar *idlname _U_) { proto_item *ti = NULL; proto_tree *tree = NULL; /* init later, inside if(tree) */ @@ -886,7 +886,11 @@ plugin_reg_handoff(void){ } G_MODULE_EXPORT void -plugin_init(plugin_address_table_t *pat){ +plugin_init(plugin_address_table_t *pat +#ifndef PLUGINS_NEED_ADDRESS_TABLE +_U_ +#endif +){ /* initialise the table of pointers needed in Win32 DLLs */ plugin_address_table_init(pat); if (proto_coseventcomm == -1) { diff --git a/plugins/giop/packet-cosnaming.c b/plugins/giop/packet-cosnaming.c index 0f5c60a4a7..8fbe4e9929 100644 --- a/plugins/giop/packet-cosnaming.c +++ b/plugins/giop/packet-cosnaming.c @@ -209,7 +209,7 @@ static const value_string CosNaming_NamingContext_NotFoundReason[] = { /* Exception = IDL:omg.org/CosNaming/NamingContext/NotFound:1.0 */ -static void decode_ex_CosNaming_NamingContext_NotFound(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_ex_CosNaming_NamingContext_NotFound(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -255,7 +255,7 @@ static void decode_ex_CosNaming_NamingContext_NotFound(tvbuff_t *tvb, packet_inf /* Exception = IDL:omg.org/CosNaming/NamingContext/CannotProceed:1.0 */ -static void decode_ex_CosNaming_NamingContext_CannotProceed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_ex_CosNaming_NamingContext_CannotProceed(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -304,9 +304,9 @@ static void decode_ex_CosNaming_NamingContext_CannotProceed(tvbuff_t *tvb, packe * */ -static gboolean decode_user_exception(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation ) { +static gboolean decode_user_exception(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_ ) { - gboolean be; /* big endianess */ + gboolean be _U_; /* big endianess */ @@ -342,7 +342,7 @@ static gboolean decode_user_exception(tvbuff_t *tvb, packet_info *pinfo, proto_t */ -static void decode_CosNaming_NamingContext_bind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosNaming_NamingContext_bind(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -435,7 +435,7 @@ static void decode_CosNaming_NamingContext_bind(tvbuff_t *tvb, packet_info *pinf */ -static void decode_CosNaming_NamingContext_rebind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosNaming_NamingContext_rebind(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -528,7 +528,7 @@ static void decode_CosNaming_NamingContext_rebind(tvbuff_t *tvb, packet_info *pi */ -static void decode_CosNaming_NamingContext_bind_context(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosNaming_NamingContext_bind_context(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -621,7 +621,7 @@ static void decode_CosNaming_NamingContext_bind_context(tvbuff_t *tvb, packet_in */ -static void decode_CosNaming_NamingContext_rebind_context(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosNaming_NamingContext_rebind_context(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -714,7 +714,7 @@ static void decode_CosNaming_NamingContext_rebind_context(tvbuff_t *tvb, packet_ */ -static void decode_CosNaming_NamingContext_resolve(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosNaming_NamingContext_resolve(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -803,7 +803,7 @@ static void decode_CosNaming_NamingContext_resolve(tvbuff_t *tvb, packet_info *p */ -static void decode_CosNaming_NamingContext_unbind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosNaming_NamingContext_unbind(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -893,7 +893,7 @@ static void decode_CosNaming_NamingContext_unbind(tvbuff_t *tvb, packet_info *pi */ -static void decode_CosNaming_NamingContext_new_context(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosNaming_NamingContext_new_context(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -962,7 +962,7 @@ static void decode_CosNaming_NamingContext_new_context(tvbuff_t *tvb, packet_inf */ -static void decode_CosNaming_NamingContext_bind_new_context(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosNaming_NamingContext_bind_new_context(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -1051,7 +1051,7 @@ static void decode_CosNaming_NamingContext_bind_new_context(tvbuff_t *tvb, packe */ -static void decode_CosNaming_NamingContext_destroy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosNaming_NamingContext_destroy(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -1121,7 +1121,7 @@ static void decode_CosNaming_NamingContext_destroy(tvbuff_t *tvb, packet_info *p */ -static void decode_CosNaming_NamingContext_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosNaming_NamingContext_list(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -1220,7 +1220,7 @@ static void decode_CosNaming_NamingContext_list(tvbuff_t *tvb, packet_info *pinf */ -static void decode_CosNaming_BindingIterator_next_one(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosNaming_BindingIterator_next_one(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -1301,7 +1301,7 @@ static void decode_CosNaming_BindingIterator_next_one(tvbuff_t *tvb, packet_info */ -static void decode_CosNaming_BindingIterator_next_n(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosNaming_BindingIterator_next_n(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -1399,7 +1399,7 @@ static void decode_CosNaming_BindingIterator_next_n(tvbuff_t *tvb, packet_info * */ -static void decode_CosNaming_BindingIterator_destroy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosNaming_BindingIterator_destroy(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -1466,7 +1466,7 @@ static void decode_CosNaming_BindingIterator_destroy(tvbuff_t *tvb, packet_info /* Struct = IDL:omg.org/CosNaming/NameComponent:1.0 */ -static void decode_CosNaming_NameComponent_st(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosNaming_NameComponent_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -1509,7 +1509,7 @@ static void decode_CosNaming_NameComponent_st(tvbuff_t *tvb, packet_info *pinfo, /* Struct = IDL:omg.org/CosNaming/Binding:1.0 */ -static void decode_CosNaming_Binding_st(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int *offset, MessageHeader *header, gchar *operation) { +static void decode_CosNaming_Binding_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -1552,7 +1552,7 @@ static void decode_CosNaming_Binding_st(tvbuff_t *tvb, packet_info *pinfo, proto } -static gboolean dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset, MessageHeader *header, gchar *operation, gchar *idlname) { +static gboolean dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset, MessageHeader *header, gchar *operation, gchar *idlname _U_) { proto_item *ti = NULL; proto_tree *tree = NULL; /* init later, inside if(tree) */ @@ -1764,7 +1764,11 @@ plugin_reg_handoff(void){ } G_MODULE_EXPORT void -plugin_init(plugin_address_table_t *pat){ +plugin_init(plugin_address_table_t *pat +#ifndef PLUGINS_NEED_ADDRESS_TABLE +_U_ +#endif +){ /* initialise the table of pointers needed in Win32 DLLs */ plugin_address_table_init(pat); if (proto_cosnaming == -1) { -- cgit v1.2.3