diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-06-29 09:00:56 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-06-29 09:00:56 +0200 |
| commit | bd0e1e5dde37cb927ad9e5d225d55d0cb636a53d (patch) | |
| tree | 52390373b797d525e283ada7609b22bdc4fe25d2 /lib | |
| parent | 8828e1226981b6a31b12a643768cac63fae3576e (diff) | |
| parent | 370f346bca176a93d034af2c0021b5da9a6101ad (diff) | |
| download | barebox-bd0e1e5dde37cb927ad9e5d225d55d0cb636a53d.tar.gz barebox-bd0e1e5dde37cb927ad9e5d225d55d0cb636a53d.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/decompress_unlz4.c | 1 | ||||
| -rw-r--r-- | lib/libfile.c | 3 | ||||
| -rw-r--r-- | lib/parameter.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/decompress_unlz4.c b/lib/decompress_unlz4.c index 46a010ad4c..2c04eac71c 100644 --- a/lib/decompress_unlz4.c +++ b/lib/decompress_unlz4.c @@ -10,7 +10,6 @@ #ifdef STATIC #define PREBOOT -#include <linux/decompress/mm.h> #include "lz4/lz4_decompress.c" #else #include <linux/decompress/unlz4.h> diff --git a/lib/libfile.c b/lib/libfile.c index 1f533133c5..3b7985fbca 100644 --- a/lib/libfile.c +++ b/lib/libfile.c @@ -162,7 +162,6 @@ char *read_file_line(const char *fmt, ...) va_list args; char *filename; char *buf, *line = NULL; - size_t size; int ret; struct stat s; @@ -177,7 +176,7 @@ char *read_file_line(const char *fmt, ...) if (s.st_size > 1024) goto out; - buf = read_file(filename, &size); + buf = read_file(filename, NULL); if (!buf) goto out; diff --git a/lib/parameter.c b/lib/parameter.c index adc3c7cdea..6642d73b6c 100644 --- a/lib/parameter.c +++ b/lib/parameter.c @@ -258,12 +258,14 @@ static int param_string_set(struct device_d *dev, struct param_d *p, const char if (!val) val = ""; - value_new = xstrdup(val); - value_new = strim(value_new); + value_new = xstrdup(skip_spaces(val)); + strim(value_new); *ps->value = value_new; - if (!ps->set) + if (!ps->set) { + free(value_save); return 0; + } ret = ps->set(p, p->driver_priv); if (ret) { |