From: Jonathan Dieter <jdieter@gmail.com>
Date: Tue, 17 Apr 2018 11:11:18 +0000 (+0300)
Subject: Cast size_t to unsigned long and ssize_t to long so we don't get warnings
X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1~1^2~312
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=75a0d776325b703bb30857f3a49a1f3d621ae95e;p=zchunk.git

Cast size_t to unsigned long and ssize_t to long so we don't get warnings
with 32-bit architectures

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---

diff --git a/src/lib/dl/range.c b/src/lib/dl/range.c
index 5e687c6..4d12669 100644
--- a/src/lib/dl/range.c
+++ b/src/lib/dl/range.c
@@ -197,7 +197,8 @@ char *zck_range_get_char(zckRangeItem **range, int max_ranges) {
     int count=0;
     while(*range) {
         int length = snprintf(output+loc, buf_size-loc, "%lu-%lu,",
-                              (*range)->start, (*range)->end);
+                              (long unsigned)(*range)->start,
+                              (long unsigned)(*range)->end);
         if(length < 0) {
             zck_log(ZCK_LOG_ERROR, "Unable to get range: %s\n",
                     strerror(errno));
diff --git a/src/unzck.c b/src/unzck.c
index faa5836..1e61f59 100644
--- a/src/unzck.c
+++ b/src/unzck.c
@@ -77,7 +77,7 @@ int main (int argc, char *argv[]) {
         if(read == 0)
             break;
         if(read > BLK_SIZE)
-            printf("read: %lu\n", read);
+            printf("read: %lu\n", (long unsigned)read);
         if(write(dst_fd, data, read) != read) {
             printf("Error writing to %s\n", out_name);
             goto error;
diff --git a/src/zck.c b/src/zck.c
index 4edecb1..7594d76 100644
--- a/src/zck.c
+++ b/src/zck.c
@@ -166,7 +166,7 @@ int main (int argc, char *argv[]) {
 
                     }
                     prev_srpm = next_srpm;
-                    printf("Compressing %li bytes\n", next-found);
+                    printf("Compressing %li bytes\n", (long)(next-found));
                     if(zck_write(zck, found, next-found) < 0)
                         exit(1);
                     if(zck_end_chunk(zck) < 0)
@@ -176,7 +176,8 @@ int main (int argc, char *argv[]) {
                     if(search > data + in_size)
                         search = data + in_size;
                 } else {
-                    printf("Completing %li bytes\n", data+in_size-found);
+                    printf("Completing %li bytes\n",
+                           (long)(data+in_size-found));
                     if(zck_write(zck, found, data+in_size-found) < 0)
                         exit(1);
                     if(zck_end_chunk(zck) < 0)
@@ -210,7 +211,7 @@ int main (int argc, char *argv[]) {
                 } else {
                     cur_loc = data + in_size;
                 }
-                printf("Completing %li bytes\n", cur_loc-start);
+                printf("Completing %li bytes\n", (long)(cur_loc-start));
                 if(zck_write(zck, start, cur_loc-start) < 0)
                     exit(1);
                 if(zck_end_chunk(zck) < 0)
diff --git a/src/zck_delta_size.c b/src/zck_delta_size.c
index ba335b5..dee1898 100644
--- a/src/zck_delta_size.c
+++ b/src/zck_delta_size.c
@@ -108,8 +108,10 @@ int main (int argc, char *argv[]) {
         total_size += tgt_idx->comp_length;
         tgt_idx = tgt_idx->next;
     }
-    printf("Would download %li of %li bytes\n", dl_size, total_size);
-    printf("Matched %li of %lu chunks\n", matched_chunks, zck_get_index_count(zck_tgt));
+    printf("Would download %li of %li bytes\n", (long)dl_size,
+           (long)total_size);
+    printf("Matched %li of %lu chunks\n", (long)matched_chunks,
+           (long unsigned)zck_get_index_count(zck_tgt));
     zck_free(&zck_tgt);
     zck_free(&zck_src);
 }
diff --git a/src/zck_dl.c b/src/zck_dl.c
index 64546d3..e4fe6c6 100644
--- a/src/zck_dl.c
+++ b/src/zck_dl.c
@@ -94,7 +94,8 @@ int main (int argc, char *argv[]) {
         exit(1);
 
 
-    printf("Downloaded %lu bytes\n", zck_dl_get_bytes_downloaded(dl));
+    printf("Downloaded %lu bytes\n",
+           (long unsigned)zck_dl_get_bytes_downloaded(dl));
     int exit_val = 0;
     switch(zck_hash_check_data(dl->zck, dl->dst_fd)) {
         case -1:
diff --git a/src/zck_read_header.c b/src/zck_read_header.c
index 5f2fa29..662852e 100644
--- a/src/zck_read_header.c
+++ b/src/zck_read_header.c
@@ -63,7 +63,7 @@ int main (int argc, char *argv[]) {
     digest = zck_get_data_digest(zck);
     printf("Data checksum: %s\n", digest);
     free(digest);
-    printf("Index count: %lu\n", zck_get_index_count(zck));
+    printf("Index count: %lu\n", (long unsigned)zck_get_index_count(zck));
     printf("Chunk checksum type: %s\n", zck_hash_name_from_type(zck_get_chunk_hash_type(zck)));
     zckIndex *idxi = zck_get_index(zck);
     if(idxi == NULL)
@@ -73,7 +73,9 @@ int main (int argc, char *argv[]) {
         char *digest = zck_get_chunk_digest(idx);
         if(digest == NULL)
             exit(1);
-        printf("%s %12lu %12lu %12lu\n", digest, idx->start + zck_get_header_length(zck), idx->comp_length, idx->length);
+        printf("%s %12lu %12lu %12lu\n", digest,
+               (long unsigned)(idx->start + zck_get_header_length(zck)),
+               (long unsigned)idx->comp_length, (long unsigned)idx->length);
         free(digest);
         idx = idx->next;
     }