wok-6.x diff linux/stuff/linux-lzma-export.u @ rev 313
Linux: fox some warnings
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Mar 02 23:16:29 2008 +0000 (2008-03-02) |
parents | bb5704323e2b |
children | 42f25f3bfca2 |
line diff
1.1 --- a/linux/stuff/linux-lzma-export.u Sun Mar 02 20:47:57 2008 +0000 1.2 +++ b/linux/stuff/linux-lzma-export.u Sun Mar 02 23:16:29 2008 +0000 1.3 @@ -1,6 +1,18 @@ 1.4 --- linux-2.6.24.2/lib/decompress_unlzma.c 1.5 +++ linux-2.6.24.2/lib/decompress_unlzma.c 1.6 -@@ -321,7 +321,7 @@ typedef struct { 1.7 +@@ -52,11 +52,6 @@ static void __init large_free(void *wher 1.8 + } 1.9 + 1.10 + #ifndef TEST 1.11 +-static void __init *malloc(size_t size) 1.12 +-{ 1.13 +- return kmalloc(size, GFP_KERNEL); 1.14 +-} 1.15 +- 1.16 + static void __init free(void *where) 1.17 + { 1.18 + kfree(where); 1.19 +@@ -321,7 +316,7 @@ typedef struct { 1.20 #define LZMA_LITERAL (LZMA_REP_LEN_CODER + LZMA_NUM_LEN_PROBS) 1.21 1.22 1.23 @@ -9,7 +21,7 @@ 1.24 int(*fill)(void*,unsigned int), 1.25 int(*writebb)(char*,unsigned int), 1.26 int *posp) 1.27 -@@ -348,10 +348,21 @@ STATIC int unlzma(char *inbuf, int in_le 1.28 +@@ -348,10 +343,21 @@ STATIC int unlzma(char *inbuf, int in_le 1.29 1.30 rc_init(&rc, fill, inbuf, in_len); 1.31 1.32 @@ -19,7 +31,7 @@ 1.33 - ((unsigned char *)&header)[i] = *rc.ptr++; 1.34 + header.dict_size = header.dst_size = in_len; 1.35 + if (inbuf && inbuf[0] == 0) { 1.36 -+ const LZMA_LC = 3, LZMA_LP = 0, LZMA_PB = 2; 1.37 ++ const int LZMA_LC = 3, LZMA_LP = 0, LZMA_PB = 2; 1.38 + header.pos = (LZMA_PB * 45) + (LZMA_LP * 5) + LZMA_LC; 1.39 + rc.ptr++; 1.40 + }