Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 178047
b: refs/heads/master
c: 5429136
h: refs/heads/master
i:
  178045: 46c3614
  178043: fb92ef7
  178039: ca80a35
  178031: be4cc73
  178015: 34f0146
  177983: 8e90e2f
  177919: 9c7efbf
v: v3
  • Loading branch information
Phillip Lougher authored and H. Peter Anvin committed Dec 15, 2009
1 parent 13501e3 commit cffdf18
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d4529862cae4de19fda8d4bbcbddc60f3e48a4cf
refs/heads/master: 54291362d2a5738e1b0495df2abcb9e6b0563a3f
10 changes: 6 additions & 4 deletions trunk/init/initramfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ static unsigned my_inptr; /* index of next byte to be processed in inbuf */

static char * __init unpack_to_rootfs(char *buf, unsigned len)
{
int written;
int written, res;
decompress_fn decompress;
const char *compress_name;
static __initdata char msg_buf[64];
Expand Down Expand Up @@ -445,10 +445,12 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len)
}
this_header = 0;
decompress = decompress_method(buf, len, &compress_name);
if (decompress)
decompress(buf, len, NULL, flush_buffer, NULL,
if (decompress) {
res = decompress(buf, len, NULL, flush_buffer, NULL,
&my_inptr, error);
else if (compress_name) {
if (res)
error("decompressor failed");
} else if (compress_name) {
if (!message) {
snprintf(msg_buf, sizeof msg_buf,
"compression method %s not configured",
Expand Down

0 comments on commit cffdf18

Please sign in to comment.