aboutsummaryrefslogtreecommitdiffstats
path: root/epan/conversation.h
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2010-04-03 18:18:50 +0000
committerBill Meier <wmeier@newsguy.com>2010-04-03 18:18:50 +0000
commit6812b68eb1973d4a439cc1342890353982a42a57 (patch)
treeb191b600b7710d04062effdc3f43d243d1150b55 /epan/conversation.h
parent68ad976a55954f7c4859c9402e4c219cf1fb5d45 (diff)
From Yaniv Kaul: constify parameters
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
Diffstat (limited to 'epan/conversation.h')
-rw-r--r--epan/conversation.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/epan/conversation.h b/epan/conversation.h
index 7c4418c68c..d19065a1e2 100644
--- a/epan/conversation.h
+++ b/epan/conversation.h
@@ -80,28 +80,28 @@ typedef struct conversation {
extern void conversation_cleanup(void);
extern void conversation_init(void);
-extern conversation_t *conversation_new(guint32 setup_frame, address *addr1, address *addr2,
- port_type ptype, guint32 port1, guint32 port2, guint options);
+extern conversation_t *conversation_new(const guint32 setup_frame, const address *addr1, const address *addr2,
+ const port_type ptype, const guint32 port1, const guint32 port2, const guint options);
-extern conversation_t *find_conversation(guint32 frame_num, address *addr_a, address *addr_b,
- port_type ptype, guint32 port_a, guint32 port_b, guint options);
+extern conversation_t *find_conversation(const guint32 frame_num, const address *addr_a, const address *addr_b,
+ const port_type ptype, const guint32 port_a, const guint32 port_b, const guint options);
-extern void conversation_add_proto_data(conversation_t *conv, int proto,
+extern void conversation_add_proto_data(conversation_t *conv, const int proto,
void *proto_data);
-extern void *conversation_get_proto_data(conversation_t *conv, int proto);
-extern void conversation_delete_proto_data(conversation_t *conv, int proto);
+extern void *conversation_get_proto_data(const conversation_t *conv, const int proto);
+extern void conversation_delete_proto_data(conversation_t *conv, const int proto);
extern void conversation_set_dissector(conversation_t *conversation,
- dissector_handle_t handle);
+ const dissector_handle_t handle);
extern gboolean
-try_conversation_dissector(address *addr_a, address *addr_b, port_type ptype,
- guint32 port_a, guint32 port_b, tvbuff_t *tvb, packet_info *pinfo,
+try_conversation_dissector(const address *addr_a, const address *addr_b, const port_type ptype,
+ const guint32 port_a, const guint32 port_b, tvbuff_t *tvb, packet_info *pinfo,
proto_tree *tree);
/* These routines are used to set undefined values for a conversation */
-extern void conversation_set_port2(conversation_t *conv, guint32 port);
-extern void conversation_set_addr2(conversation_t *conv, address *addr);
+extern void conversation_set_port2(conversation_t *conv, const guint32 port);
+extern void conversation_set_addr2(conversation_t *conv, const address *addr);
#ifdef __cplusplus
}