From 4ab9051bd30dec196bb10801fcde746776f5a3a7 Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Mon, 21 Apr 2014 15:50:34 +0200 Subject: don't cast negative error codes to unsigned size_t The cast prevents us from doing proper error checking. Signed-off-by: Lucas Stach Signed-off-by: Sascha Hauer --- common/uimage.c | 6 +++--- include/image.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/uimage.c b/common/uimage.c index 7fbef8688e..243dfb0df5 100644 --- a/common/uimage.c +++ b/common/uimage.c @@ -74,7 +74,7 @@ void uimage_print_contents(struct uimage_handle *handle) } EXPORT_SYMBOL(uimage_print_contents); -size_t uimage_get_size(struct uimage_handle *handle, unsigned int image_no) +ssize_t uimage_get_size(struct uimage_handle *handle, unsigned int image_no) { if (image_no >= handle->nb_data_entries) return -EINVAL; @@ -373,7 +373,7 @@ struct resource *file_to_sdram(const char *filename, unsigned long adr) struct resource *res; size_t size = BUFSIZ; size_t ofs = 0; - size_t now; + ssize_t now; int fd; fd = open(filename, O_RDONLY); @@ -420,7 +420,7 @@ struct resource *uimage_load_to_sdram(struct uimage_handle *handle, int image_no, unsigned long load_address) { int ret; - size_t size; + ssize_t size; resource_size_t start = (resource_size_t)load_address; uimage_buf = (void *)load_address; diff --git a/include/image.h b/include/image.h index 0c8a4b138d..730e3d75b8 100644 --- a/include/image.h +++ b/include/image.h @@ -230,7 +230,7 @@ int uimage_verify(struct uimage_handle *handle); int uimage_load(struct uimage_handle *handle, unsigned int image_no, int(*flush)(void*, unsigned int)); void uimage_print_contents(struct uimage_handle *handle); -size_t uimage_get_size(struct uimage_handle *handle, unsigned int image_no); +ssize_t uimage_get_size(struct uimage_handle *handle, unsigned int image_no); struct resource *uimage_load_to_sdram(struct uimage_handle *handle, int image_no, unsigned long load_address); void *uimage_load_to_buf(struct uimage_handle *handle, int image_no, -- cgit v1.2.3