diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-16 08:52:09 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-16 08:52:09 +0000 |
| commit | 5a85b7fed2eb804db57cde3c851a12088cc60ee7 (patch) | |
| tree | 80e3d37b1fe7dc5176b11794585f29346fbc0477 /epan/dissectors/packet-ctdb.c | |
| parent | 27744ecc2d9925491e5ef8cc97e41d551efc6a2e (diff) | |
[-Wmissing-prototypes]
Use explicit casts.
svn path=/trunk/; revision=48338
Diffstat (limited to 'epan/dissectors/packet-ctdb.c')
| -rw-r--r-- | epan/dissectors/packet-ctdb.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c index 58445deeaa..c387f7aff8 100644 --- a/epan/dissectors/packet-ctdb.c +++ b/epan/dissectors/packet-ctdb.c @@ -31,6 +31,9 @@ #include <epan/expert.h> #include <epan/emem.h> +void proto_register_ctdb(void); +void proto_reg_handoff_ctdb(void); + /* Initialize the protocol and registered fields */ static int proto_ctdb = -1; static int hf_ctdb_length = -1; @@ -616,7 +619,7 @@ dissect_ctdb_reply_dmaster(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr tkey[1].length=1; tkey[1].key=&dst; tkey[2].length=0; - ctdb_trans=se_tree_lookup32_array(ctdb_transactions, &tkey[0]); + ctdb_trans=(ctdb_trans_t *)se_tree_lookup32_array(ctdb_transactions, &tkey[0]); if(ctdb_trans){ ctdb_trans->response_in=pinfo->fd->num; @@ -682,7 +685,7 @@ dissect_ctdb_req_dmaster(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot tkey[1].length=1; tkey[1].key=&dmaster; tkey[2].length=0; - ctdb_trans=se_tree_lookup32_array(ctdb_transactions, &tkey[0]); + ctdb_trans=(ctdb_trans_t *)se_tree_lookup32_array(ctdb_transactions, &tkey[0]); if(ctdb_trans){ ctdb_display_trans(pinfo, tree, tvb, ctdb_trans); @@ -748,7 +751,7 @@ dissect_ctdb_req_control(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot if(!pinfo->fd->flags.visited){ emem_tree_key_t tkey[4]; - ctdb_control=se_alloc(sizeof(ctdb_control_t)); + ctdb_control=se_new(ctdb_control_t); ctdb_control->opcode=opcode; ctdb_control->request_in=pinfo->fd->num; ctdb_control->response_in=0; @@ -772,7 +775,7 @@ dissect_ctdb_req_control(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot tkey[2].length=1; tkey[2].key=&dst; tkey[3].length=0; - ctdb_control=se_tree_lookup32_array(ctdb_controls, &tkey[0]); + ctdb_control=(ctdb_control_t *)se_tree_lookup32_array(ctdb_controls, &tkey[0]); } @@ -803,7 +806,7 @@ dissect_ctdb_reply_control(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr tkey[2].length=1; tkey[2].key=&src; tkey[3].length=0; - ctdb_control=se_tree_lookup32_array(ctdb_controls, &tkey[0]); + ctdb_control=(ctdb_control_t *)se_tree_lookup32_array(ctdb_controls, &tkey[0]); if(!ctdb_control){ return offset; @@ -938,7 +941,7 @@ dissect_ctdb_req_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree if(!pinfo->fd->flags.visited){ emem_tree_key_t tkey[3]; - ctdb_trans=se_alloc(sizeof(ctdb_trans_t)); + ctdb_trans=se_new(ctdb_trans_t); ctdb_trans->key_hash=keyhash; ctdb_trans->request_in=pinfo->fd->num; ctdb_trans->response_in=0; @@ -958,7 +961,7 @@ dissect_ctdb_req_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree tkey[1].length=1; tkey[1].key=&caller; tkey[2].length=0; - ctdb_trans=se_tree_lookup32_array(ctdb_transactions, &tkey[0]); + ctdb_trans=(ctdb_trans_t *)se_tree_lookup32_array(ctdb_transactions, &tkey[0]); } if(ctdb_trans){ |