diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:24 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:24 +0100 |
| commit | e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa (patch) | |
| tree | 075fbf70c17a50190c3fb290eb6b362177f0d1e5 /lib | |
| parent | 18aa86831ed72380b7c2edba3c27bbf7a999da76 (diff) | |
| parent | 1e7f2bd25c28b36c7c40ed4797b2a21cc4e1502e (diff) | |
| download | barebox-e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa.tar.gz barebox-e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
scripts/Makefile
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gui/bmp.c | 4 | ||||
| -rw-r--r-- | lib/gui/png_pico.c | 2 | ||||
| -rw-r--r-- | lib/math.c | 1 | ||||
| -rw-r--r-- | lib/unlink-recursive.c | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/lib/gui/bmp.c b/lib/gui/bmp.c index dcf30952d2..6943a1c8e0 100644 --- a/lib/gui/bmp.c +++ b/lib/gui/bmp.c @@ -19,8 +19,8 @@ struct image *bmp_open(char *inbuf, int insize) } img->data = inbuf; - img->height = le32_to_cpu(bmp->header.height);; - img->width = le32_to_cpu(bmp->header.width);; + img->height = le32_to_cpu(bmp->header.height); + img->width = le32_to_cpu(bmp->header.width); img->bits_per_pixel = le16_to_cpu(bmp->header.bit_count); pr_debug("bmp: %d x %d x %d data@0x%p\n", img->width, img->height, diff --git a/lib/gui/png_pico.c b/lib/gui/png_pico.c index 393a732bc4..256db35ce0 100644 --- a/lib/gui/png_pico.c +++ b/lib/gui/png_pico.c @@ -57,7 +57,7 @@ struct image *png_open(char *inbuf, int insize) png_info = PNG_decode(inbuf, insize); if(PNG_error) { - printf("error %u:\n", PNG_error); + printf("error %i:\n", PNG_error); ret = -EINVAL; goto err; } diff --git a/lib/math.c b/lib/math.c index 5a68f5e8b2..a4731edb9a 100644 --- a/lib/math.c +++ b/lib/math.c @@ -118,6 +118,7 @@ #include <linux/ctype.h> #include <linux/string.h> #include <libbb.h> +#include <errno.h> #include <math.h> #define lookupvar (math_state->lookupvar) diff --git a/lib/unlink-recursive.c b/lib/unlink-recursive.c index a4885538c0..8f7812f852 100644 --- a/lib/unlink-recursive.c +++ b/lib/unlink-recursive.c @@ -1,4 +1,5 @@ #include <common.h> +#include <errno.h> #include <libbb.h> #include <fs.h> |