projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: stmmac: sun8i: add support for Allwinner H6 EMAC
[linux-2.6-microblaze.git]
/
lib
/
decompress_unlzma.c
diff --git
a/lib/decompress_unlzma.c
b/lib/decompress_unlzma.c
index
0be83af
..
ed7a1fd
100644
(file)
--- a/
lib/decompress_unlzma.c
+++ b/
lib/decompress_unlzma.c
@@
-620,7
+620,7
@@
STATIC inline int INIT unlzma(unsigned char *buf, long in_len,
num_probs = LZMA_BASE_SIZE + (LZMA_LIT_SIZE << (lc + lp));
p = (uint16_t *) large_malloc(num_probs * sizeof(*p));
num_probs = LZMA_BASE_SIZE + (LZMA_LIT_SIZE << (lc + lp));
p = (uint16_t *) large_malloc(num_probs * sizeof(*p));
- if (p ==
0
)
+ if (p ==
NULL
)
goto exit_2;
num_probs = LZMA_LITERAL + (LZMA_LIT_SIZE << (lc + lp));
for (i = 0; i < num_probs; i++)
goto exit_2;
num_probs = LZMA_LITERAL + (LZMA_LIT_SIZE << (lc + lp));
for (i = 0; i < num_probs; i++)
@@
-667,13
+667,12
@@
exit_0:
}
#ifdef PREBOOT
}
#ifdef PREBOOT
-STATIC int INIT decompress(unsigned char *buf, long in_len,
+STATIC int INIT
__
decompress(unsigned char *buf, long in_len,
long (*fill)(void*, unsigned long),
long (*flush)(void*, unsigned long),
long (*fill)(void*, unsigned long),
long (*flush)(void*, unsigned long),
- unsigned char *output,
+ unsigned char *output,
long out_len,
long *posp,
long *posp,
- void(*error)(char *x)
- )
+ void (*error)(char *x))
{
return unlzma(buf, in_len - 4, fill, flush, output, posp, error);
}
{
return unlzma(buf, in_len - 4, fill, flush, output, posp, error);
}