osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Pull tvb_init() into tvb_new(); there's no other way to get a new 

tvbuff, so we might as well keep all the "here's a new tvbuff" code
together.

svn path=/trunk/; revision=48939
This commit is contained in:
Guy Harris 2013-04-19 23:39:35 +00:00
parent d72bce7558
commit 5524d0f801
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
epan/tvbuff.c
View File

@ -62,12 +62,15 @@ ensure_contiguous(tvbuff_t *tvb, const gint offset, const gint length);
static guint64
_tvb_get_bits64(tvbuff_t *tvb, guint bit_offset, const gint total_no_of_bits);
static void
tvb_init(tvbuff_t *tvb, const tvbuff_type type)
static tvbuff_t *
tvb_new(const tvbuff_type type)
{
tvbuff_t *tvb;
tvb_backing_t *backing;
tvb_comp_t *composite;
tvb = g_slice_new(tvbuff_t);
tvb->previous = NULL;
tvb->next = NULL;
tvb->type = type;
@ -103,16 +106,6 @@ tvb_init(tvbuff_t *tvb, const tvbuff_type type)
DISSECTOR_ASSERT_NOT_REACHED();
break;
}
}
static tvbuff_t *
tvb_new(const tvbuff_type type)
{
tvbuff_t *tvb;
tvb = g_slice_new(tvbuff_t);
tvb_init(tvb, type);
return tvb;
}