osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Swallow up tvb_set_real_data_no_exceptions() into tvb_new_real_data() - 

the only caller is tvb_new_real_data().

svn path=/trunk/; revision=47757
This commit is contained in:
Guy Harris 2013-02-20 01:01:32 +00:00
parent 5f5e1085ea
commit cf1070b4b1
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/tvbuff.c
View File

@ -226,15 +226,6 @@ tvb_set_child_real_data_tvbuff(tvbuff_t *parent, tvbuff_t *child)
add_to_chain(parent, child);
}
static void
tvb_set_real_data_no_exceptions(tvbuff_t *tvb, const guint8* data, const guint length, const gint reported_length)
{
tvb->real_data = data;
tvb->length = length;
tvb->reported_length = reported_length;
tvb->initialized = TRUE;
}
tvbuff_t *
tvb_new_real_data(const guint8* data, const guint length, const gint reported_length)
{
@ -244,7 +235,10 @@ tvb_new_real_data(const guint8* data, const guint length, const gint reported_le
tvb = tvb_new(TVBUFF_REAL_DATA);
tvb_set_real_data_no_exceptions(tvb, data, length, reported_length);
tvb->real_data = data;
tvb->length = length;
tvb->reported_length = reported_length;
tvb->initialized = TRUE;
/*
* This is the top-level real tvbuff for this data source,