[PATCH 14/14] don't cast negative error codes to unsigned size_t
Lucas Stach
dev at lynxeye.de
Fri Feb 7 03:48:56 EST 2014
The cast prevents us from doing proper error checking.
Signed-off-by: Lucas Stach <dev at lynxeye.de>
---
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 7fbef86..4296359 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)
+int 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;
+ int 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;
+ int 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 0c8a4b1..1592348 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);
+int 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,
--
1.8.5.3
More information about the barebox
mailing list