From 6473a21d8bfe0eb923e4adfd2b536e79ca248081 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 16 Mar 2018 18:27:03 +1100 Subject: Consolidate utilfdt_read_len() variants There are no less than _four_ variants on utilfdt_read() which is a bit excessive. The _len() variants are particularly pointless, since we can achieve the same thing with very little extra verbosity by using the usual convention of ignoring return parameters if they're NULL. So, get rid of them (we keep the shorter names without _len, but add now-optional len parameters). Signed-off-by: David Gibson Reviewed-by: Simon Glass Tested-by: Alexey Kardashevskiy Reviewed-by: Alexey Kardashevskiy --- util.h | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'util.h') diff --git a/util.h b/util.h index 66fba8e..d3058ed 100644 --- a/util.h +++ b/util.h @@ -98,16 +98,10 @@ char get_escape_char(const char *s, int *i); * stderr. * * @param filename The filename to read, or - for stdin - * @return Pointer to allocated buffer containing fdt, or NULL on error - */ -char *utilfdt_read(const char *filename); - -/** - * Like utilfdt_read(), but also passes back the size of the file read. - * * @param len If non-NULL, the amount of data we managed to read + * @return Pointer to allocated buffer containing fdt, or NULL on error */ -char *utilfdt_read_len(const char *filename, off_t *len); +char *utilfdt_read(const char *filename, off_t *len); /** * Read a device tree file into a buffer. Does not report errors, but only @@ -116,16 +110,10 @@ char *utilfdt_read_len(const char *filename, off_t *len); * * @param filename The filename to read, or - for stdin * @param buffp Returns pointer to buffer containing fdt - * @return 0 if ok, else an errno value representing the error - */ -int utilfdt_read_err(const char *filename, char **buffp); - -/** - * Like utilfdt_read_err(), but also passes back the size of the file read. - * * @param len If non-NULL, the amount of data we managed to read + * @return 0 if ok, else an errno value representing the error */ -int utilfdt_read_err_len(const char *filename, char **buffp, off_t *len); +int utilfdt_read_err(const char *filename, char **buffp, off_t *len); /** * Write a device tree buffer to a file. This will report any errors on -- cgit v1.1