Fix comparisons between signed and unsigned values.

[android-x86/external-exfat.git] / libexfat / io.c

diff --git a/libexfat/io.c b/libexfat/io.c
index b65aa6d..c4d73ed 100644 (file)
--- a/libexfat/io.c
+++ b/libexfat/io.c
@@ -373,26 +373,27 @@ ssize_t exfat_pwrite(struct exfat_dev* dev, const void* buffer, size_t size,
 ssize_t exfat_generic_pread(const struct exfat* ef, struct exfat_node* node,
                void* buffer, size_t size, off_t offset)
 {
+       uint64_t newsize = offset;
        cluster_t cluster;
        char* bufp = buffer;
        off_t lsize, loffset, remainder;
 
        if (offset < 0)
                return -EINVAL;
-       if (offset >= node->size)
+       if (newsize >= node->size)
                return 0;
        if (size == 0)
                return 0;
 
-       cluster = exfat_advance_cluster(ef, node, offset / CLUSTER_SIZE(*ef->sb));
+       cluster = exfat_advance_cluster(ef, node, newsize / CLUSTER_SIZE(*ef->sb));
        if (CLUSTER_INVALID(*ef->sb, cluster))
        {
                exfat_error("invalid cluster 0x%x while reading", cluster);
                return -EIO;
        }
 
-       loffset = offset % CLUSTER_SIZE(*ef->sb);
-       remainder = MIN(size, node->size - offset);
+       loffset = newsize % CLUSTER_SIZE(*ef->sb);
+       remainder = MIN(size, node->size - newsize);
        while (remainder > 0)
        {
                if (CLUSTER_INVALID(*ef->sb, cluster))
@@ -414,12 +415,13 @@ ssize_t exfat_generic_pread(const struct exfat* ef, struct exfat_node* node,
        }
        if (!(node->attrib & EXFAT_ATTRIB_DIR) && !ef->ro && !ef->noatime)
                exfat_update_atime(node);
-       return MIN(size, node->size - offset) - remainder;
+       return MIN(size, node->size - newsize) - remainder;
 }
 
 ssize_t exfat_generic_pwrite(struct exfat* ef, struct exfat_node* node,
                const void* buffer, size_t size, off_t offset)
 {
+       uint64_t newsize = offset;
        int rc;
        cluster_t cluster;
        const char* bufp = buffer;
@@ -427,29 +429,29 @@ ssize_t exfat_generic_pwrite(struct exfat* ef, struct exfat_node* node,
 
        if (offset < 0)
                return -EINVAL;
-       if (offset > node->size)
+       if (newsize > node->size)
        {
-               rc = exfat_truncate(ef, node, offset, true);
+               rc = exfat_truncate(ef, node, newsize, true);
                if (rc != 0)
                        return rc;
        }
-       if (offset + size > node->size)
+       if (newsize + size > node->size)
        {
-               rc = exfat_truncate(ef, node, offset + size, false);
+               rc = exfat_truncate(ef, node, newsize + size, false);
                if (rc != 0)
                        return rc;
        }
        if (size == 0)
                return 0;
 
-       cluster = exfat_advance_cluster(ef, node, offset / CLUSTER_SIZE(*ef->sb));
+       cluster = exfat_advance_cluster(ef, node, newsize / CLUSTER_SIZE(*ef->sb));
        if (CLUSTER_INVALID(*ef->sb, cluster))
        {
                exfat_error("invalid cluster 0x%x while writing", cluster);
                return -EIO;
        }
 
-       loffset = offset % CLUSTER_SIZE(*ef->sb);
+       loffset = newsize % CLUSTER_SIZE(*ef->sb);
        remainder = size;
        while (remainder > 0)
        {