diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-05-09 08:49:42 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-05-09 08:49:42 +0200 |
| commit | 55aca0a48c5cb68eeddf723a5bc69fc052071e61 (patch) | |
| tree | 00961bee994725f5d3ee678c5630b53ecc5a02fe /common/globalvar.c | |
| parent | 216f412ede9cb78ccdfd00df89246ab1ffc9e300 (diff) | |
| parent | 18f0d2221a4c781dad2a224f8ac17e7c95fd1d9c (diff) | |
| download | barebox-55aca0a48c5cb68eeddf723a5bc69fc052071e61.tar.gz barebox-55aca0a48c5cb68eeddf723a5bc69fc052071e61.tar.xz | |
Merge branch 'for-next/include-cleanup'
Diffstat (limited to 'common/globalvar.c')
| -rw-r--r-- | common/globalvar.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/common/globalvar.c b/common/globalvar.c index 05c3e798d7..5dad4f6a45 100644 --- a/common/globalvar.c +++ b/common/globalvar.c @@ -52,7 +52,7 @@ static int nv_save(const char *name, const char *val) if (ret) return ret; - fname = asprintf("/env/nv/%s", name); + fname = basprintf("/env/nv/%s", name); fd = open(fname, O_CREAT | O_WRONLY | O_TRUNC); @@ -61,7 +61,7 @@ static int nv_save(const char *name, const char *val) if (fd < 0) return fd; - fprintf(fd, "%s", val); + dprintf(fd, "%s", val); close(fd); @@ -145,7 +145,7 @@ int nvvar_remove(const char *name) if (!p) return -ENOENT; - fname = asprintf("/env/nv/%s", p->name); + fname = basprintf("/env/nv/%s", p->name); unlink(fname); free(fname); @@ -227,7 +227,8 @@ char *globalvar_get_match(const char *match, const char *separator) if (!strncmp(match, param->name, strlen(match))) { const char *p = dev_get_param(&global_device, param->name); if (val) { - char *new = asprintf("%s%s%s", val, separator, p); + char *new = basprintf("%s%s%s", val, + separator, p); free(val); val = new; } else { |