summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-03-07 09:25:09 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2014-03-07 09:25:09 +0100
commita8a08f88cc8c2c78bcc421cd55144813b081bcec (patch)
tree67e818ea7ce5ab531251467e13fa3ec3e18e11c7 /lib
parent2331b1d8e8d7aabe52b4fd65ca200cf8288aec88 (diff)
parentd0343211a27b982c3ef61597b68a6bf76df887af (diff)
downloadbarebox-a8a08f88cc8c2c78bcc421cd55144813b081bcec.tar.gz
barebox-a8a08f88cc8c2c78bcc421cd55144813b081bcec.tar.xz
Merge branch 'for-next/misc'
Conflicts: common/environment.c
Diffstat (limited to 'lib')
-rw-r--r--lib/libbb.c2
-rw-r--r--lib/math.c6
-rw-r--r--lib/parameter.c3
3 files changed, 5 insertions, 6 deletions
diff --git a/lib/libbb.c b/lib/libbb.c
index 189a1705cc..dd42e662b4 100644
--- a/lib/libbb.c
+++ b/lib/libbb.c
@@ -43,7 +43,7 @@ EXPORT_SYMBOL(concat_path_file);
char *concat_subpath_file(const char *path, const char *f)
{
- if (f && DOT_OR_DOTDOT(f))
+ if (DOT_OR_DOTDOT(f))
return NULL;
return concat_path_file(path, f);
}
diff --git a/lib/math.c b/lib/math.c
index a4731edb9a..19c8f08ba8 100644
--- a/lib/math.c
+++ b/lib/math.c
@@ -306,7 +306,7 @@ static const char *arith_lookup_val(arith_state_t *math_state, var_or_num_t *t)
/* treat undefined var as 0 */
t->val = 0;
}
- return 0;
+ return NULL;
}
/* "Applying" a token means performing it on the top elements on the integer
@@ -546,8 +546,8 @@ static arith_t evaluate_string(arith_state_t *math_state, const char *expr)
arith_t result;
if (numstack == NULL || stack == NULL) {
- errmsg = "out of memory";
- goto err_with_custom_msg;
+ math_state->errmsg = "out of memory";
+ return -1;
}
/* Start with a left paren */
diff --git a/lib/parameter.c b/lib/parameter.c
index c5c6426bb2..a0bae3e90a 100644
--- a/lib/parameter.c
+++ b/lib/parameter.c
@@ -108,8 +108,7 @@ int dev_set_param(struct device_d *dev, const char *name, const char *val)
int dev_param_set_generic(struct device_d *dev, struct param_d *p,
const char *val)
{
- if (p->value)
- free(p->value);
+ free(p->value);
if (!val) {
p->value = NULL;
return 0;