Round of warning fixing

Blosc · Apr 1, 2024 · af6602e · af6602e
1 parent 059065c
commit af6602e
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 13 deletions.
diff --git a/bench/b2nd/bench_stack_append.c b/bench/b2nd/bench_stack_append.c
@@ -13,6 +13,7 @@
 // when data to append is of the same size as the chunkshape.  This benchmark
 // compares the performance of the new accelerated path with the old one.
 
+#include <inttypes.h>
 #include "blosc2.h"
 #include "b2nd.h"
 
@@ -87,8 +88,9 @@ int main() {
     }
     blosc_set_timestamp(&t1);
     printf("Time to append (%s): %.4f s\n", accel_str, blosc_elapsed_secs(t0, t1));
-    printf("Number of chunks: %lld\n", src->sc->nchunks);
-    printf("Shape of array: (%lld, %lld, %lld)\n", src->shape[0], src->shape[1], src->shape[2]);
+    printf("Number of chunks: %" PRId64 "\n", src->sc->nchunks);
+    printf("Shape of array: (%" PRId64 ", %" PRId64 ", %" PRId64 ")\n",
+           src->shape[0], src->shape[1], src->shape[2]);
 
     b2nd_free(src);
     b2nd_free_ctx(ctx);

diff --git a/blosc/b2nd.c b/blosc/b2nd.c
@@ -1223,7 +1223,7 @@ int extend_shape(b2nd_array_t *array, const int64_t *new_shape, const int64_t *s
       BLOSC_ERROR(BLOSC2_ERROR_INVALID_PARAM);
     }
     if (array->shape[i] == INT64_MAX) {
-      BLOSC_TRACE_ERROR("Cannot extend array with shape[%d] = %lld", i, INT64_MAX);
+      BLOSC_TRACE_ERROR("Cannot extend array with shape[%d] = %" PRId64 "d", i, INT64_MAX);
       BLOSC_ERROR(BLOSC2_ERROR_INVALID_PARAM);
     }
   }

diff --git a/examples/delta_schunk_ex.c b/examples/delta_schunk_ex.c
@@ -68,7 +68,10 @@ int main(void) {
       data[i] = i * (int64_t)nchunk;
     }
     nchunks = blosc2_schunk_append_buffer(schunk, data, isize);
-    assert(nchunks == nchunk);
+    if (nchunks != nchunk) {
+      printf("Unexpected nchunks!");
+      return nchunks;
+    }
   }
   /* Gather some info */
   nbytes = schunk->nbytes;

diff --git a/examples/frame_backed_schunk.c b/examples/frame_backed_schunk.c
@@ -68,7 +68,11 @@ int main(void) {
       data[i] = i * nchunk;
     }
     nchunks = blosc2_schunk_append_buffer(schunk1, data, isize);
-    assert(nchunks == nchunk + 1);
+    if (nchunks != nchunk + 1) {
+      printf("Unexpected nchunks!");
+      return nchunks;
+    }
+
   }
   /* Gather some info */
   nbytes = schunk1->nbytes;

diff --git a/examples/frame_metalayers.c b/examples/frame_metalayers.c
@@ -71,11 +71,14 @@ int main(void) {
 
   blosc_set_timestamp(&last);
   for (nchunk = 0; nchunk < NCHUNKS; nchunk++) {
-      for (i = 0; i < CHUNKSIZE; i++) {
-          data[i] = i * nchunk + i;
-      }
-      nchunks = blosc2_schunk_append_buffer(schunk, data, isize);
-      assert(nchunks == nchunk + 1);
+    for (i = 0; i < CHUNKSIZE; i++) {
+      data[i] = i * nchunk + i;
+    }
+    nchunks = blosc2_schunk_append_buffer(schunk, data, isize);
+    if (nchunks != nchunk + 1) {
+      printf("Unexpected nchunks!");
+      return nchunks;
+    }
   }
   /* Gather some info */
   nbytes = schunk->nbytes;

diff --git a/examples/frame_offset.c b/examples/frame_offset.c
@@ -75,7 +75,10 @@ int main(void) {
       data2[i] = 2 * i * nchunk;
     }
     nchunks = blosc2_schunk_append_buffer(schunk0w, data, isize);
-    assert(nchunks == nchunk + 1);
+    if (nchunks != nchunk + 1) {
+      printf("Unexpected nchunks!");
+      return nchunks;
+    }
     blosc2_schunk_append_buffer(schunk1a, data2, isize);
   }
 

diff --git a/examples/zstd_dict.c b/examples/zstd_dict.c
@@ -70,7 +70,10 @@ int main(void) {
       data[i] = i + (int64_t)nchunk * CHUNKSIZE;
     }
     nchunks = blosc2_schunk_append_buffer(schunk, data, isize);
-    assert(nchunks == nchunk + 1);
+    if (nchunks != nchunk + 1) {
+      printf("Unexpected nchunks!");
+      return nchunks;
+    }
   }
   /* Gather some info */
   nbytes = schunk->nbytes;

diff --git a/plugins/filters/int_trunc/test_int_trunc.c b/plugins/filters/int_trunc/test_int_trunc.c
@@ -7,6 +7,7 @@
 
 #include <stdio.h>
 #include <assert.h>
+#include <inttypes.h>
 #include "blosc2.h"
 #include "blosc2/filters-registry.h"
 
@@ -102,7 +103,7 @@ int main64(void) {
       // Check for precision
       if ((data_buffer[i] - rec_buffer[i]) > (1LL << PRECISION_BITS)) {
         printf("Value not in tolerance margin: ");
-        printf("%lld - %lld: %lld, (nchunk: %d, nelem: %d)\n",
+        printf("%" PRId64 " - %" PRId64 ": %" PRId64 ", (nchunk: %d, nelem: %d)\n",
                data_buffer[i], rec_buffer[i],
                (data_buffer[i] - rec_buffer[i]), nchunk, i);
         return -1;

diff --git a/tests/test_shuffle_roundtrip_avx2.c b/tests/test_shuffle_roundtrip_avx2.c
@@ -77,6 +77,10 @@ static int test_shuffle_roundtrip_avx2(int32_t type_size, int32_t num_elements,
 
   return exit_code;
 #else
+  BLOSC_UNUSED_PARAM(type_size);
+  BLOSC_UNUSED_PARAM(num_elements);
+  BLOSC_UNUSED_PARAM(buffer_alignment);
+  BLOSC_UNUSED_PARAM(test_type);
   return EXIT_SUCCESS;
 #endif /* defined(SHUFFLE_USE_AVX2) */
 }