diff options
Diffstat (limited to 'scripts/dtc/util.c')
-rw-r--r-- | scripts/dtc/util.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/scripts/dtc/util.c b/scripts/dtc/util.c index 9953c32a0244..a69b7a13463d 100644 --- a/scripts/dtc/util.c +++ b/scripts/dtc/util.c | |||
@@ -227,11 +227,11 @@ char get_escape_char(const char *s, int *i) | |||
227 | return val; | 227 | return val; |
228 | } | 228 | } |
229 | 229 | ||
230 | int utilfdt_read_err_len(const char *filename, char **buffp, off_t *len) | 230 | int utilfdt_read_err(const char *filename, char **buffp, size_t *len) |
231 | { | 231 | { |
232 | int fd = 0; /* assume stdin */ | 232 | int fd = 0; /* assume stdin */ |
233 | char *buf = NULL; | 233 | char *buf = NULL; |
234 | off_t bufsize = 1024, offset = 0; | 234 | size_t bufsize = 1024, offset = 0; |
235 | int ret = 0; | 235 | int ret = 0; |
236 | 236 | ||
237 | *buffp = NULL; | 237 | *buffp = NULL; |
@@ -264,20 +264,15 @@ int utilfdt_read_err_len(const char *filename, char **buffp, off_t *len) | |||
264 | free(buf); | 264 | free(buf); |
265 | else | 265 | else |
266 | *buffp = buf; | 266 | *buffp = buf; |
267 | *len = bufsize; | 267 | if (len) |
268 | *len = bufsize; | ||
268 | return ret; | 269 | return ret; |
269 | } | 270 | } |
270 | 271 | ||
271 | int utilfdt_read_err(const char *filename, char **buffp) | 272 | char *utilfdt_read(const char *filename, size_t *len) |
272 | { | ||
273 | off_t len; | ||
274 | return utilfdt_read_err_len(filename, buffp, &len); | ||
275 | } | ||
276 | |||
277 | char *utilfdt_read_len(const char *filename, off_t *len) | ||
278 | { | 273 | { |
279 | char *buff; | 274 | char *buff; |
280 | int ret = utilfdt_read_err_len(filename, &buff, len); | 275 | int ret = utilfdt_read_err(filename, &buff, len); |
281 | 276 | ||
282 | if (ret) { | 277 | if (ret) { |
283 | fprintf(stderr, "Couldn't open blob from '%s': %s\n", filename, | 278 | fprintf(stderr, "Couldn't open blob from '%s': %s\n", filename, |
@@ -288,12 +283,6 @@ char *utilfdt_read_len(const char *filename, off_t *len) | |||
288 | return buff; | 283 | return buff; |
289 | } | 284 | } |
290 | 285 | ||
291 | char *utilfdt_read(const char *filename) | ||
292 | { | ||
293 | off_t len; | ||
294 | return utilfdt_read_len(filename, &len); | ||
295 | } | ||
296 | |||
297 | int utilfdt_write_err(const char *filename, const void *blob) | 286 | int utilfdt_write_err(const char *filename, const void *blob) |
298 | { | 287 | { |
299 | int fd = 1; /* assume stdout */ | 288 | int fd = 1; /* assume stdout */ |