X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_nameval.c;h=767f9e0daef58562ff8d9cd0c075ad6ee4a33cb3;hp=4bdf4ed743a7195dca0e3af8ac7775801b96b42c;hb=refs%2Fheads%2Fclean-up;hpb=9ee5d0643e559568dbe62215f76e0a7bd5a63d93 diff --git a/yaffs_nameval.c b/yaffs_nameval.c index 4bdf4ed..767f9e0 100644 --- a/yaffs_nameval.c +++ b/yaffs_nameval.c @@ -44,7 +44,7 @@ static int nval_find(const char *xb, int xb_size, const YCHAR *name, return pos; } pos += size; - if (pos < xb_size - sizeof(int)) + if (pos < xb_size - (int)sizeof(int)) memcpy(&size, xb + pos, sizeof(int)); else size = 0; @@ -62,7 +62,7 @@ static int nval_used(const char *xb, int xb_size) memcpy(&size, xb + pos, sizeof(int)); while (size > 0 && (size < xb_size) && (pos + size < xb_size)) { pos += size; - if (pos < xb_size - sizeof(int)) + if (pos < xb_size - (int)sizeof(int)) memcpy(&size, xb + pos, sizeof(int)); else size = 0; @@ -173,7 +173,7 @@ int nval_list(const char *xb, int xb_size, char *buf, int bsize) int filled = 0; memcpy(&size, xb + pos, sizeof(int)); - while (size > sizeof(int) && + while (size > (int)sizeof(int) && size <= xb_size && (pos + size) < xb_size && !filled) { @@ -194,7 +194,7 @@ int nval_list(const char *xb, int xb_size, char *buf, int bsize) filled = 1; } pos += size; - if (pos < xb_size - sizeof(int)) + if (pos < xb_size - (int)sizeof(int)) memcpy(&size, xb + pos, sizeof(int)); else size = 0;