diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-11 18:28:10 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-11 18:28:10 +0000 |
| commit | e1c5ffd5537e81e33f2c4c1d651220bec02bdb98 (patch) | |
| tree | e2502adb06ba0828334aa6a78266dd79e033e78c /epan/tvbuff.c | |
| parent | 158827a5e74ad7f0b1a9d7dc6b2d9765acb821c0 (diff) | |
(Trivial change) move ensure_contiguous() to reflect call hierarchy
svn path=/trunk/; revision=29382
Diffstat (limited to 'epan/tvbuff.c')
| -rw-r--r-- | epan/tvbuff.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/epan/tvbuff.c b/epan/tvbuff.c index 7e2ca93a65..6c08ddccb1 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -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) { |