From 64f5d56bba8c7d8a8512b81360b1135ac5e6cb7d Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Mon, 24 May 2010 15:13:02 +0000 Subject: Fix reassemble_test's (copy of the) proto_tree_add_item() prototype to get it compiling again. fragment_add_seq_check(), fragment_add_seq_802_11(), and fragment_add_seq_next() all call fragment_add_seq_check_work() so make their prototypes match each other in const-ness. This fixes a warning when compiling reassemble_test. svn path=/trunk/; revision=32933 --- epan/reassemble.c | 55 +++++++++++++++++++++++++++++--------------------- epan/reassemble.h | 26 ++++++++++++++---------- epan/reassemble_test.c | 8 ++++---- 3 files changed, 51 insertions(+), 38 deletions(-) diff --git a/epan/reassemble.c b/epan/reassemble.c index d4aba9df24..eccc4255a4 100644 --- a/epan/reassemble.c +++ b/epan/reassemble.c @@ -1645,11 +1645,13 @@ fragment_add_seq_key(tvbuff_t *tvb, const int offset, const packet_info *pinfo, * XXX - Should we simply return NULL for zero-length fragments? */ static fragment_data * -fragment_add_seq_check_work(tvbuff_t *tvb, const int offset, const packet_info *pinfo, - const guint32 id, GHashTable *fragment_table, - GHashTable *reassembled_table, const guint32 frag_number, - const guint32 frag_data_len, const gboolean more_frags, - const guint32 flags) +fragment_add_seq_check_work(tvbuff_t *tvb, const int offset, + const packet_info *pinfo, const guint32 id, + GHashTable *fragment_table, + GHashTable *reassembled_table, + const guint32 frag_number, + const guint32 frag_data_len, + const gboolean more_frags, const guint32 flags) { reassembled_key reass_key; fragment_key key; @@ -1713,36 +1715,43 @@ fragment_add_seq_check_work(tvbuff_t *tvb, const int offset, const packet_info * } fragment_data * -fragment_add_seq_check(tvbuff_t *tvb, const int offset, const packet_info *pinfo, - const guint32 id, GHashTable *fragment_table, - GHashTable *reassembled_table, const guint32 frag_number, - const guint32 frag_data_len, const gboolean more_frags) +fragment_add_seq_check(tvbuff_t *tvb, const int offset, + const packet_info *pinfo, const guint32 id, + GHashTable *fragment_table, + GHashTable *reassembled_table, const guint32 frag_number, + const guint32 frag_data_len, const gboolean more_frags) { return fragment_add_seq_check_work(tvb, offset, pinfo, id, - fragment_table, reassembled_table, frag_number, frag_data_len, - more_frags, 0); + fragment_table, reassembled_table, + frag_number, frag_data_len, + more_frags, 0); } fragment_data * -fragment_add_seq_802_11(tvbuff_t *tvb, int offset, packet_info *pinfo, - guint32 id, GHashTable *fragment_table, - GHashTable *reassembled_table, guint32 frag_number, - guint32 frag_data_len, gboolean more_frags) +fragment_add_seq_802_11(tvbuff_t *tvb, const int offset, + const packet_info *pinfo, const guint32 id, + GHashTable *fragment_table, + GHashTable *reassembled_table, + const guint32 frag_number, const guint32 frag_data_len, + const gboolean more_frags) { return fragment_add_seq_check_work(tvb, offset, pinfo, id, - fragment_table, reassembled_table, frag_number, frag_data_len, - more_frags, REASSEMBLE_FLAGS_802_11_HACK); + fragment_table, reassembled_table, + frag_number, frag_data_len, + more_frags, + REASSEMBLE_FLAGS_802_11_HACK); } fragment_data * -fragment_add_seq_next(tvbuff_t *tvb, int offset, packet_info *pinfo, - guint32 id, GHashTable *fragment_table, - GHashTable *reassembled_table, guint32 frag_data_len, - gboolean more_frags) +fragment_add_seq_next(tvbuff_t *tvb, const int offset, const packet_info *pinfo, + const guint32 id, GHashTable *fragment_table, + GHashTable *reassembled_table, const guint32 frag_data_len, + const gboolean more_frags) { return fragment_add_seq_check_work(tvb, offset, pinfo, id, - fragment_table, reassembled_table, 0, frag_data_len, - more_frags, REASSEMBLE_FLAGS_NO_FRAG_NUMBER); + fragment_table, reassembled_table, 0, + frag_data_len, more_frags, + REASSEMBLE_FLAGS_NO_FRAG_NUMBER); } void diff --git a/epan/reassemble.h b/epan/reassemble.h index b67a86b294..09a7ebfcf9 100644 --- a/epan/reassemble.h +++ b/epan/reassemble.h @@ -214,21 +214,25 @@ fragment_add_dcerpc_dg(tvbuff_t *tvb, const int offset, const packet_info *pinfo * head of the fragment list. */ extern fragment_data * -fragment_add_seq_check(tvbuff_t *tvb, const int offset, const packet_info *pinfo, - const guint32 id, GHashTable *fragment_table, - GHashTable *reassembled_table, const guint32 frag_number, - const guint32 frag_data_len, const gboolean more_frags); +fragment_add_seq_check(tvbuff_t *tvb, const int offset, + const packet_info *pinfo, const guint32 id, + GHashTable *fragment_table, + GHashTable *reassembled_table, const guint32 frag_number, + const guint32 frag_data_len, const gboolean more_frags); extern fragment_data * -fragment_add_seq_802_11(tvbuff_t *tvb, int offset, packet_info *pinfo, - guint32 id, GHashTable *fragment_table, - GHashTable *reassembled_table, guint32 frag_number, - guint32 frag_data_len, gboolean more_frags); +fragment_add_seq_802_11(tvbuff_t *tvb, const int offset, + const packet_info *pinfo, const guint32 id, + GHashTable *fragment_table, + GHashTable *reassembled_table, + const guint32 frag_number, const guint32 frag_data_len, + const gboolean more_frags); extern fragment_data * -fragment_add_seq_next(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 id, - GHashTable *fragment_table, GHashTable *reassembled_table, - guint32 frag_data_len, gboolean more_frags); +fragment_add_seq_next(tvbuff_t *tvb, const int offset, const packet_info *pinfo, + const guint32 id, GHashTable *fragment_table, + GHashTable *reassembled_table, + const guint32 frag_data_len, const gboolean more_frags); extern void fragment_start_seq_check(const packet_info *pinfo, const guint32 id, GHashTable *fragment_table, diff --git a/epan/reassemble_test.c b/epan/reassemble_test.c index 7f012b3d02..4f87acc8c5 100644 --- a/epan/reassemble_test.c +++ b/epan/reassemble_test.c @@ -559,9 +559,9 @@ test_fragment_add_dcerpc_dg(void) * Adds a couple of out-of-order fragments and checks their reassembly. */ static void -test_fragment_add_seq_check_work(fragment_data *(*fn)(tvbuff_t *, int, - packet_info *, guint32, GHashTable *, - GHashTable *, guint32, guint32, gboolean)) +test_fragment_add_seq_check_work(fragment_data *(*fn)(tvbuff_t *, const int, + const packet_info *, const guint32, GHashTable *, + GHashTable *, const guint32, const guint32, const gboolean)) { fragment_data *fd_head; @@ -1103,7 +1103,7 @@ proto_item *proto_tree_add_boolean(proto_tree *tree _U_, int hfindex _U_, proto_item *proto_tree_add_item(proto_tree *tree _U_, const int hfindex _U_, tvbuff_t *tvb _U_, const gint start _U_, gint length _U_, - const gboolean little_endian _U_) + const guint little_endian _U_) { return NULL; } gint check_col(column_info *cinfo _U_, const gint col _U_) -- cgit v1.2.3