aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2013-03-01 14:48:10 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2013-03-01 14:48:10 +0100
commit507f6ea6d2de1bd8298c396edaa600a41bc5ae6e (patch)
treea662fe66bebab17209547c0baef7eec889cca9dd
parenta2d04e0702dcdd8b4d2e41145253608b8fd95c9d (diff)
downloadbusybox-w32-507f6ea6d2de1bd8298c396edaa600a41bc5ae6e.tar.gz
busybox-w32-507f6ea6d2de1bd8298c396edaa600a41bc5ae6e.tar.bz2
busybox-w32-507f6ea6d2de1bd8298c396edaa600a41bc5ae6e.zip
decompress_unlzma: move function, no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--archival/libarchive/decompress_unlzma.c13
1 files changed, 6 insertions, 7 deletions
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)
65 rc->range <<= 8; 65 rc->range <<= 8;
66 rc->code = (rc->code << 8) | *rc->ptr++; 66 rc->code = (rc->code << 8) | *rc->ptr++;
67} 67}
68static ALWAYS_INLINE void rc_normalize(rc_t *rc)
69{
70 if (rc->range < (1 << RC_TOP_BITS)) {
71 rc_do_normalize(rc);
72 }
73}
68 74
69/* Called once */ 75/* Called once */
70static ALWAYS_INLINE rc_t* rc_init(int fd) /*, int buffer_size) */ 76static ALWAYS_INLINE rc_t* rc_init(int fd) /*, int buffer_size) */
@@ -90,13 +96,6 @@ static ALWAYS_INLINE void rc_free(rc_t *rc)
90 free(rc); 96 free(rc);
91} 97}
92 98
93static ALWAYS_INLINE void rc_normalize(rc_t *rc)
94{
95 if (rc->range < (1 << RC_TOP_BITS)) {
96 rc_do_normalize(rc);
97 }
98}
99
100/* rc_is_bit_1 is called 9 times */ 99/* rc_is_bit_1 is called 9 times */
101static speed_inline int rc_is_bit_1(rc_t *rc, uint16_t *p) 100static speed_inline int rc_is_bit_1(rc_t *rc, uint16_t *p)
102{ 101{