diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-07 16:42:04 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-07 16:42:04 +0100 |
| commit | c3a84a3f760b3892501591f5a6b037611477dc9f (patch) | |
| tree | ded61e87cdeb597fdf96edf72618ed9d518e74bd /lib | |
| parent | a0643f615d3f54866443050334229c984b83c1b1 (diff) | |
| parent | ac6e464cb29e83c02c9e39a4b78a819d82b4f06b (diff) | |
| download | barebox-c3a84a3f760b3892501591f5a6b037611477dc9f.tar.gz barebox-c3a84a3f760b3892501591f5a6b037611477dc9f.tar.xz | |
Merge branch 'for-next/ext4'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gui/image_renderer.c | 6 | ||||
| -rw-r--r-- | lib/uncompress.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/gui/image_renderer.c b/lib/gui/image_renderer.c index 41dc43b3c..78e5777cb 100644 --- a/lib/gui/image_renderer.c +++ b/lib/gui/image_renderer.c @@ -13,10 +13,10 @@ static LIST_HEAD(image_renderers); -static struct image_renderer *get_renderer(void* buf) +static struct image_renderer *get_renderer(void* buf, size_t bufsize) { struct image_renderer *ir; - enum filetype type = file_detect_type(buf); + enum filetype type = file_detect_type(buf, bufsize); list_for_each_entry(ir, &image_renderers, list) { if (ir->type == type) @@ -40,7 +40,7 @@ struct image *image_renderer_open(const char* file) return ERR_PTR(-ENOMEM); } - ir = get_renderer(data); + ir = get_renderer(data, size); if (!ir) { ret = -ENOENT; goto out; diff --git a/lib/uncompress.c b/lib/uncompress.c index 8e4d3a1d9..e0a69df9f 100644 --- a/lib/uncompress.c +++ b/lib/uncompress.c @@ -78,7 +78,7 @@ int uncompress(unsigned char *inbuf, int len, char *err; if (inbuf) { - ft = file_detect_type(inbuf); + ft = file_detect_type(inbuf, len); uncompress_buf = NULL; uncompress_size = 0; } else { @@ -93,7 +93,7 @@ int uncompress(unsigned char *inbuf, int len, if (ret < 0) goto err; - ft = file_detect_type(uncompress_buf); + ft = file_detect_type(uncompress_buf, 32); } switch (ft) { |