Fix warnings

Blosc · May 18, 2020 · 2c9907e · 2c9907e
1 parent 4e391cf
commit 2c9907e
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/blosc/frame.c b/blosc/frame.c
@@ -287,7 +287,7 @@ void *new_header_frame(blosc2_schunk *schunk, blosc2_frame *frame) {
   assert(hsize2 == current_header_len);  // sanity check
 
   // Map size + int16 size
-  assert((hsize2 - hsize) < (1U << 16U));
+  assert((uint32_t) (hsize2 - hsize) < (1U << 16U));
   uint16_t map_size = (uint16_t) (hsize2 - hsize);
   swap_store(h2 + FRAME_IDX_SIZE, &map_size, sizeof(map_size));
 
@@ -876,7 +876,7 @@ int frame_get_metalayers(blosc2_frame* frame, blosc2_schunk* schunk) {
     header = malloc(header_len);
     FILE* fp = fopen(frame->fname, "rb");
     size_t rbytes = fread(header, 1, header_len, fp);
-    if (rbytes != header_len) {
+    if (rbytes != (size_t) header_len) {
       fprintf(stderr, "Cannot access the header out of the fileframe.\n");
       fclose(fp);
       return -2;

diff --git a/blosc/schunk.c b/blosc/schunk.c
@@ -421,7 +421,7 @@ int blosc2_get_metalayer(blosc2_schunk *schunk, const char *name, uint8_t **cont
 /* Update the content of the usermeta chunk. */
 int blosc2_update_usermeta(blosc2_schunk *schunk, uint8_t *content, int32_t content_len,
                            blosc2_cparams cparams) {
-  if (content_len > (1u << 31u)) {
+  if ((uint32_t) content_len > (1u << 31u)) {
     fprintf(stderr, "Error: content_len cannot exceed 2 GB");
     return -1;
   }

diff --git a/compat/filegen.c b/compat/filegen.c
@@ -79,7 +79,7 @@ int main(int argc, char *argv[]) {
 
     /* Write data_out to argv[3] */
     f = fopen(argv[3], "wb+");
-    if (fwrite(data_out, 1, (size_t) csize, f) == csize) {
+    if (fwrite(data_out, 1, (size_t) csize, f) == (uint32_t) csize) {
       printf("Wrote %s\n", argv[3]);
     } else {
       printf("Write failed");
@@ -90,7 +90,7 @@ int main(int argc, char *argv[]) {
     fseek(f, 0, SEEK_END);
     fsize = ftell(f);
     fseek(f, 0, SEEK_SET);
-    if (fread(data_out, 1, (size_t) fsize, f) == fsize) {
+    if (fread(data_out, 1, (size_t) fsize, f) == (uint32_t) fsize) {
       printf("Checking %s\n", argv[2]);
     } else {
       printf("Read failed");

diff --git a/tests/test_bitshuffle_leftovers.c b/tests/test_bitshuffle_leftovers.c
@@ -102,7 +102,7 @@ int main() {
   int result;
 
   /* Initialize data */
-  for (int i = 0; i < size / sizeof(int32_t); i++) {
+  for (int i = 0; i < (int) (size / sizeof(int32_t)); i++) {
     ((uint32_t*)data)[i] = i;
   }
   /* leftovers */

diff --git a/tests/test_common.h b/tests/test_common.h
@@ -164,7 +164,7 @@ static void dummy_threads_callback(void *callback_data, void (*dojob)(void *), i
     dojob(((char *) jobdata) + ((unsigned) i)*jobdata_elsize);
 }
 /* install the callback if environment variable BLOSC_TEST_CALLBACK="yes" */
-static void install_blosc_callback_test(void)
+inline static void install_blosc_callback_test(void)
 {
   char *callback_env;
   callback_env = getenv("BLOSC_TEST_CALLBACK");

diff --git a/tests/test_frame.c b/tests/test_frame.c
@@ -109,7 +109,7 @@ static char* test_frame() {
 
   if (usermeta) {
     int content_len_ = blosc2_get_usermeta(schunk, &content_);
-    mu_assert("ERROR: bad usermeta length in frame", content_len_ == content_len);
+    mu_assert("ERROR: bad usermeta length in frame", (size_t) content_len_ == content_len);
     mu_assert("ERROR: bad usermeta data in frame", strncmp((char*)content_, content, content_len) == 0);
     free(content_);
     blosc2_update_usermeta(schunk, (uint8_t *) content2, (int32_t) content_len2, BLOSC2_CPARAMS_DEFAULTS);
@@ -145,7 +145,7 @@ static char* test_frame() {
 
   if (usermeta) {
     int content_len_ = blosc2_get_usermeta(schunk, &content_);
-    mu_assert("ERROR: bad usermeta length in frame", content_len_ == content_len2);
+    mu_assert("ERROR: bad usermeta length in frame", (size_t) content_len_ == content_len2);
     mu_assert("ERROR: bad usermeta data in frame", strncmp((char*)content_, content2, content_len2) == 0);
     free(content_);
     blosc2_update_usermeta(schunk, (uint8_t *) content3, (int32_t) content_len3, BLOSC2_CPARAMS_DEFAULTS);
@@ -202,7 +202,7 @@ static char* test_frame() {
 
   if (usermeta) {
     int content_len_ = blosc2_get_usermeta(schunk, &content_);
-    mu_assert("ERROR: bad usermeta length in frame", content_len_ == content_len3);
+    mu_assert("ERROR: bad usermeta length in frame", (size_t) content_len_ == content_len3);
     mu_assert("ERROR: bad usermeta data in frame", strncmp((char*)content_, content3, content_len3) == 0);
     free(content_);
   }

diff --git a/tests/test_getitem_delta.c b/tests/test_getitem_delta.c
@@ -53,7 +53,7 @@ static char* test_getitem() {
 
   /* Now that we see the round-trip passed, check the getitem */
   int get_result = blosc_getitem(intermediate, start_item, num_items, items);
-  mu_assert("ERROR: the number of items in getitem is not correct", get_result == (num_items * type_size));
+  mu_assert("ERROR: the number of items in getitem is not correct", (uint32_t) get_result == (num_items * type_size));
   mu_assert("ERROR: getitem with delta filter fails", memcmp(original, items, get_result) == 0);
 
   /* Free allocated memory. */