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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29382 f5534014-38df-0310-8fa8-9805f1628bb7

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)
 {