From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Fri, 1 Mar 2013 13:48:10 +0000 (+0100)
Subject: decompress_unlzma: move function, no code changes
X-Git-Tag: 1_22_0~250
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=507f6ea6d2de1bd8298c396edaa600a41bc5ae6e;p=oweals%2Fbusybox.git

decompress_unlzma: move function, no code changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/archival/libarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c
index 187035daa..ca32bd82c 100644
--- a/archival/libarchive/decompress_unlzma.c
+++ b/archival/libarchive/decompress_unlzma.c
@@ -65,6 +65,12 @@ static void rc_do_normalize(rc_t *rc)
 	rc->range <<= 8;
 	rc->code = (rc->code << 8) | *rc->ptr++;
 }
+static ALWAYS_INLINE void rc_normalize(rc_t *rc)
+{
+	if (rc->range < (1 << RC_TOP_BITS)) {
+		rc_do_normalize(rc);
+	}
+}
 
 /* Called once */
 static ALWAYS_INLINE rc_t* rc_init(int fd) /*, int buffer_size) */
@@ -90,13 +96,6 @@ static ALWAYS_INLINE void rc_free(rc_t *rc)
 	free(rc);
 }
 
-static ALWAYS_INLINE void rc_normalize(rc_t *rc)
-{
-	if (rc->range < (1 << RC_TOP_BITS)) {
-		rc_do_normalize(rc);
-	}
-}
-
 /* rc_is_bit_1 is called 9 times */
 static speed_inline int rc_is_bit_1(rc_t *rc, uint16_t *p)
 {