diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-02-20 01:01:32 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-02-20 01:01:32 +0000 |
| commit | cf1070b4b12e97a7b2c233bdc966e7ff3972acb5 (patch) | |
| tree | 67d81ff629dc6c9771e55e07e7c24f297d49c4ab /epan | |
| parent | 5f5e1085eaecd2c9e2eea7a6437442d2406f0433 (diff) | |
| download | wireshark-cf1070b4b12e97a7b2c233bdc966e7ff3972acb5.tar.gz | |
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
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/tvbuff.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/epan/tvbuff.c b/epan/tvbuff.c index 133c965092..408fe3ebb0 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -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, |