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

(Trivial change) move ensure_contiguous() to reflect call hierarchy 

svn path=/trunk/; revision=29382
This commit is contained in:
Kovarththanan Rajaratnam 2009-08-11 18:28:10 +00:00
parent 158827a5e7
commit e1c5ffd553
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
epan/tvbuff.c
View File

@ -862,7 +862,20 @@ ensure_contiguous_no_exception(tvbuff_t *tvb, gint offset, gint length,
return NULL;
}
/* ----------------------------- */
static const guint8*
ensure_contiguous(tvbuff_t *tvb, gint offset, gint length)
{
int exception;
const guint8 *p;
p = ensure_contiguous_no_exception(tvb, offset, length, &exception);
if (p == NULL) {
DISSECTOR_ASSERT(exception > 0);
THROW(exception);
}
return p;
}
static const guint8*
fast_ensure_contiguous(tvbuff_t *tvb, gint offset, guint length)
{
@ -892,21 +905,6 @@ fast_ensure_contiguous(tvbuff_t *tvb, gint offset, guint length)
return NULL;
}
static const guint8*
ensure_contiguous(tvbuff_t *tvb, gint offset, gint length)
{
int exception;
const guint8 *p;
p = ensure_contiguous_no_exception(tvb, offset, length, &exception);
if (p == NULL) {
DISSECTOR_ASSERT(exception > 0);
THROW(exception);
}
return p;
}
static const guint8*
guint8_find(const guint8* haystack, size_t haystacklen, guint8 needle)
{