aboutsummaryrefslogtreecommitdiffstats
path: root/epan/reassemble.c
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss@ulticom.com>2010-05-24 15:13:02 +0000
committerJeff Morriss <jeff.morriss@ulticom.com>2010-05-24 15:13:02 +0000
commit64f5d56bba8c7d8a8512b81360b1135ac5e6cb7d (patch)
treefa1dc25c33697035f115b27ac6501ccc11107b07 /epan/reassemble.c
parent2543a7ab9116c42e7f71b30219f126c0224a882d (diff)
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
Diffstat (limited to 'epan/reassemble.c')
-rw-r--r--epan/reassemble.c55
1 files changed, 32 insertions, 23 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