diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-05-09 08:49:43 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-05-09 08:49:43 +0200 |
| commit | 4cb8e17aa3972e27f4b34e5bb2df9e7007824ac2 (patch) | |
| tree | 942b24dcd275407d76f6b3ef85f6db9af1160163 /lib | |
| parent | 854df603da65bc56fe72218b402903f26155b0f0 (diff) | |
| parent | 79fdb84a6b46f7c129225b57007b63e765747d52 (diff) | |
| download | barebox-4cb8e17aa3972e27f4b34e5bb2df9e7007824ac2.tar.gz barebox-4cb8e17aa3972e27f4b34e5bb2df9e7007824ac2.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bzlib_private.h | 11 | ||||
| -rw-r--r-- | lib/glob.c | 2 | ||||
| -rw-r--r-- | lib/rbtree.c | 4 |
3 files changed, 4 insertions, 13 deletions
diff --git a/lib/bzlib_private.h b/lib/bzlib_private.h index 87d8f94525..de10dd4215 100644 --- a/lib/bzlib_private.h +++ b/lib/bzlib_private.h @@ -67,6 +67,7 @@ #define _BZLIB_PRIVATE_H #include <malloc.h> +#include <linux/stddef.h> #include "bzlib.h" @@ -515,16 +516,6 @@ BZ2_hbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*, #endif - -/*-- BZ_NO_STDIO seems to make NULL disappear on some platforms. --*/ - -#ifdef BZ_NO_STDIO -#ifndef NULL -#define NULL 0 -#endif -#endif - - /*-------------------------------------------------------------*/ /*--- end bzlib_private.h ---*/ /*-------------------------------------------------------------*/ diff --git a/lib/glob.c b/lib/glob.c index 1b0137b9a9..5a997ca092 100644 --- a/lib/glob.c +++ b/lib/glob.c @@ -428,7 +428,7 @@ glob_t *pglob; elems = pglob->gl_pathc + 2; if (flags & GLOB_DOOFFS) elems += pglob->gl_offs; - + pglob->gl_pathv = xrealloc(pglob->gl_pathv, elems * sizeof(char *)); if (flags & GLOB_DOOFFS) diff --git a/lib/rbtree.c b/lib/rbtree.c index 7297792677..6fba2c5bd7 100644 --- a/lib/rbtree.c +++ b/lib/rbtree.c @@ -444,7 +444,7 @@ struct rb_node *rb_next(const struct rb_node *node) * as we can. */ if (node->rb_right) { - node = node->rb_right; + node = node->rb_right; while (node->rb_left) node=node->rb_left; return (struct rb_node *)node; @@ -476,7 +476,7 @@ struct rb_node *rb_prev(const struct rb_node *node) * as we can. */ if (node->rb_left) { - node = node->rb_left; + node = node->rb_left; while (node->rb_right) node=node->rb_right; return (struct rb_node *)node; |