len0rd/dtc
1
0
Fork 0
mirror of https://github.com/dgibson/dtc.git synced 2025-10-13 16:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "utilfdt_read: pass back up the length of data read"

Browse source 
This reverts commit cc2c178727.
It was the wrong version of the patch.
This commit is contained in:
Jon Loeliger 2013-04-22 15:41:41 -05:00
parent 31be4ce7ca
commit 5543b88d5e
5 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdtget.c
View file

@ -254,7 +254,7 @@ static int do_fdtget(struct display_info *disp, const char *filename,
const char *prop; const char *prop;
int i, node; int i, node;
blob = utilfdt_read(filename, NULL); blob = utilfdt_read(filename);
if (!blob) if (!blob)
return -1; return -1;

2
fdtput.c
View file

@ -239,7 +239,7 @@ static int do_fdtput(struct display_info *disp, const char *filename,
char *blob; char *blob;
int len, ret = 0; int len, ret = 0;
blob = utilfdt_read(filename, NULL); blob = utilfdt_read(filename);
if (!blob) if (!blob)
return -1; return -1;

2
tests/testutils.c
View file

@ -160,7 +160,7 @@ int nodename_eq(const char *s1, const char *s2)
void *load_blob(const char *filename) void *load_blob(const char *filename)
{ {
char *blob; char *blob;
int ret = utilfdt_read_err(filename, &blob, NULL); int ret = utilfdt_read_err(filename, &blob);
if (ret) if (ret)
CONFIG("Couldn't open blob from \"%s\": %s", filename, CONFIG("Couldn't open blob from \"%s\": %s", filename,

8
util.c
View file

@ -198,7 +198,7 @@ char get_escape_char(const char *s, int *i)
return val; return val;
} }
int utilfdt_read_err(const char *filename, char **buffp, off_t *len) int utilfdt_read_err(const char *filename, char **buffp)
{ {
int fd = 0; /* assume stdin */ int fd = 0; /* assume stdin */
char *buf = NULL; char *buf = NULL;
@ -239,15 +239,13 @@ int utilfdt_read_err(const char *filename, char **buffp, off_t *len)
free(buf); free(buf);
else else
*buffp = buf; *buffp = buf;
if (len)
*len = bufsize;
return ret; return ret;
} }
char *utilfdt_read(const char *filename, off_t *len) char *utilfdt_read(const char *filename)
{ {
char *buff; char *buff;
int ret = utilfdt_read_err(filename, &buff, len); int ret = utilfdt_read_err(filename, &buff);
if (ret) { if (ret) {
fprintf(stderr, "Couldn't open blob from '%s': %s\n", filename, fprintf(stderr, "Couldn't open blob from '%s': %s\n", filename,

6
util.h
View file

@ -80,10 +80,9 @@ char get_escape_char(const char *s, int *i);
* stderr. * stderr.
* *
* @param filename The filename to read, or - for stdin * @param filename The filename to read, or - for stdin
* @param len If non-NULL, the amount of data we managed to read
* @return Pointer to allocated buffer containing fdt, or NULL on error * @return Pointer to allocated buffer containing fdt, or NULL on error
*/ */
char *utilfdt_read(const char *filename, off_t *len); char *utilfdt_read(const char *filename);
/** /**
* Read a device tree file into a buffer. Does not report errors, but only * Read a device tree file into a buffer. Does not report errors, but only
@ -92,10 +91,9 @@ char *utilfdt_read(const char *filename, off_t *len);
* *
* @param filename The filename to read, or - for stdin * @param filename The filename to read, or - for stdin
* @param buffp Returns pointer to buffer containing fdt * @param buffp Returns pointer to buffer containing fdt
* @param len If non-NULL, the amount of data we managed to read
* @return 0 if ok, else an errno value representing the error * @return 0 if ok, else an errno value representing the error
*/ */
int utilfdt_read_err(const char *filename, char **buffp, off_t *len); int utilfdt_read_err(const char *filename, char **buffp);
/** /**