More clean up

[yaffs2.git] / yaffs_nameval.c

diff --git a/yaffs_nameval.c b/yaffs_nameval.c
index 487b03e19fd9a6f0fb06800f7dde867602ccdc16..767f9e0daef58562ff8d9cd0c075ad6ee4a33cb3 100644 (file)
--- a/yaffs_nameval.c
+++ b/yaffs_nameval.c
@@ -37,13 +37,14 @@ static int nval_find(const char *xb, int xb_size, const YCHAR *name,
 
        memcpy(&size, xb, sizeof(int));
        while (size > 0 && (size < xb_size) && (pos + size < xb_size)) {
-               if (!strncmp((YCHAR *) (xb + pos + sizeof(int)), name, size)) {
+               if (!strncmp((YCHAR *) (xb + pos + sizeof(int)),
+                               name, size)) {
                        if (exist_size)
                                *exist_size = size;
                        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;
@@ -61,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;
@@ -172,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) {
@@ -193,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;