unlzma: move some variables in "more local" scope

No code changes as verified by objdump

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

diff --git a/archival/libarchive/decompress_unlzma.c b/archival/libarchive/decompress_unlzma.c
index ca32bd82cd0e962845a2cecb2fe7d846b27e1bdd..a89b846a0a1de527b67595fbfb2512f56a6dafe2 100644 (file)
--- a/archival/libarchive/decompress_unlzma.c
+++ b/archival/libarchive/decompress_unlzma.c
@@ -214,8 +214,6 @@ unpack_lzma_stream(transformer_aux_data_t *aux UNUSED_PARAM, int src_fd, int dst
        uint32_t pos_state_mask;
        uint32_t literal_pos_mask;
        uint16_t *p;
-       int num_bits;
-       int num_probs;
        rc_t *rc;
        int i;
        uint8_t *buffer;
@@ -247,11 +245,15 @@ unpack_lzma_stream(transformer_aux_data_t *aux UNUSED_PARAM, int src_fd, int dst
 
        buffer = xmalloc(MIN(header.dst_size, header.dict_size));
 
-       num_probs = LZMA_BASE_SIZE + (LZMA_LIT_SIZE << (lc + lp));
-       p = xmalloc(num_probs * sizeof(*p));
-       num_probs += LZMA_LITERAL - LZMA_BASE_SIZE;
-       for (i = 0; i < num_probs; i++)
-               p[i] = (1 << RC_MODEL_TOTAL_BITS) >> 1;
+       {
+               int num_probs;
+
+               num_probs = LZMA_BASE_SIZE + (LZMA_LIT_SIZE << (lc + lp));
+               p = xmalloc(num_probs * sizeof(*p));
+               num_probs += LZMA_LITERAL - LZMA_BASE_SIZE;
+               for (i = 0; i < num_probs; i++)
+                       p[i] = (1 << RC_MODEL_TOTAL_BITS) >> 1;
+       }
 
        rc = rc_init(src_fd); /*, RC_BUFFER_SIZE); */
 
@@ -310,6 +312,7 @@ unpack_lzma_stream(transformer_aux_data_t *aux UNUSED_PARAM, int src_fd, int dst
                        goto one_byte2;
 #endif
                } else {
+                       int num_bits;
                        int offset;
                        uint16_t *prob2;
 #define prob_len prob2