Fix a bunch of -Wtype-limits warnings.

diff --git a/include/share/alloc.h b/include/share/alloc.h
index 26fc508..75043fa 100644 (file)
--- a/include/share/alloc.h
+++ b/include/share/alloc.h
@@ -49,7 +49,7 @@
 #ifndef SIZE_MAX
 # ifndef SIZE_T_MAX
 #  ifdef _MSC_VER
-#   define SIZE_T_MAX UINT_MAX
+#   define SIZE_T_MAX UINT_MAX /* What happens on 64 bit windows? */
 #  else
 #   error
 #  endif

diff --git a/src/libFLAC/include/private/memory.h b/src/libFLAC/include/private/memory.h
index 71cbf99..f37e516 100644 (file)
--- a/src/libFLAC/include/private/memory.h
+++ b/src/libFLAC/include/private/memory.h
@@ -45,12 +45,12 @@
  * Use free() on this address to deallocate.
  */
 void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address);
-FLAC__bool FLAC__memory_alloc_aligned_int32_array(unsigned elements, FLAC__int32 **unaligned_pointer, FLAC__int32 **aligned_pointer);
-FLAC__bool FLAC__memory_alloc_aligned_uint32_array(unsigned elements, FLAC__uint32 **unaligned_pointer, FLAC__uint32 **aligned_pointer);
-FLAC__bool FLAC__memory_alloc_aligned_uint64_array(unsigned elements, FLAC__uint64 **unaligned_pointer, FLAC__uint64 **aligned_pointer);
-FLAC__bool FLAC__memory_alloc_aligned_unsigned_array(unsigned elements, unsigned **unaligned_pointer, unsigned **aligned_pointer);
+FLAC__bool FLAC__memory_alloc_aligned_int32_array(size_t elements, FLAC__int32 **unaligned_pointer, FLAC__int32 **aligned_pointer);
+FLAC__bool FLAC__memory_alloc_aligned_uint32_array(size_t elements, FLAC__uint32 **unaligned_pointer, FLAC__uint32 **aligned_pointer);
+FLAC__bool FLAC__memory_alloc_aligned_uint64_array(size_t elements, FLAC__uint64 **unaligned_pointer, FLAC__uint64 **aligned_pointer);
+FLAC__bool FLAC__memory_alloc_aligned_unsigned_array(size_t elements, unsigned **unaligned_pointer, unsigned **aligned_pointer);
 #ifndef FLAC__INTEGER_ONLY_LIBRARY
-FLAC__bool FLAC__memory_alloc_aligned_real_array(unsigned elements, FLAC__real **unaligned_pointer, FLAC__real **aligned_pointer);
+FLAC__bool FLAC__memory_alloc_aligned_real_array(size_t elements, FLAC__real **unaligned_pointer, FLAC__real **aligned_pointer);
 #endif
 
 #endif

diff --git a/src/libFLAC/memory.c b/src/libFLAC/memory.c
index 8f07424..eb26279 100644 (file)
--- a/src/libFLAC/memory.c
+++ b/src/libFLAC/memory.c
@@ -71,7 +71,7 @@ void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address)
        return x;
 }
 
-FLAC__bool FLAC__memory_alloc_aligned_int32_array(unsigned elements, FLAC__int32 **unaligned_pointer, FLAC__int32 **aligned_pointer)
+FLAC__bool FLAC__memory_alloc_aligned_int32_array(size_t elements, FLAC__int32 **unaligned_pointer, FLAC__int32 **aligned_pointer)
 {
        FLAC__int32 *pu; /* unaligned pointer */
        union { /* union needed to comply with C99 pointer aliasing rules */
@@ -84,10 +84,10 @@ FLAC__bool FLAC__memory_alloc_aligned_int32_array(unsigned elements, FLAC__int32
        FLAC__ASSERT(0 != aligned_pointer);
        FLAC__ASSERT(unaligned_pointer != aligned_pointer);
 
-       if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
+       if(elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
                return false;
 
-       pu = (FLAC__int32*)FLAC__memory_alloc_aligned(sizeof(*pu) * (size_t)elements, &u.pv);
+       pu = (FLAC__int32*)FLAC__memory_alloc_aligned(sizeof(*pu) * elements, &u.pv);
        if(0 == pu) {
                return false;
        }
@@ -100,7 +100,7 @@ FLAC__bool FLAC__memory_alloc_aligned_int32_array(unsigned elements, FLAC__int32
        }
 }
 
-FLAC__bool FLAC__memory_alloc_aligned_uint32_array(unsigned elements, FLAC__uint32 **unaligned_pointer, FLAC__uint32 **aligned_pointer)
+FLAC__bool FLAC__memory_alloc_aligned_uint32_array(size_t elements, FLAC__uint32 **unaligned_pointer, FLAC__uint32 **aligned_pointer)
 {
        FLAC__uint32 *pu; /* unaligned pointer */
        union { /* union needed to comply with C99 pointer aliasing rules */
@@ -113,7 +113,7 @@ FLAC__bool FLAC__memory_alloc_aligned_uint32_array(unsigned elements, FLAC__uint
        FLAC__ASSERT(0 != aligned_pointer);
        FLAC__ASSERT(unaligned_pointer != aligned_pointer);
 
-       if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
+       if(elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
                return false;
 
        pu = (FLAC__uint32*)FLAC__memory_alloc_aligned(sizeof(*pu) * elements, &u.pv);
@@ -129,7 +129,7 @@ FLAC__bool FLAC__memory_alloc_aligned_uint32_array(unsigned elements, FLAC__uint
        }
 }
 
-FLAC__bool FLAC__memory_alloc_aligned_uint64_array(unsigned elements, FLAC__uint64 **unaligned_pointer, FLAC__uint64 **aligned_pointer)
+FLAC__bool FLAC__memory_alloc_aligned_uint64_array(size_t elements, FLAC__uint64 **unaligned_pointer, FLAC__uint64 **aligned_pointer)
 {
        FLAC__uint64 *pu; /* unaligned pointer */
        union { /* union needed to comply with C99 pointer aliasing rules */
@@ -142,7 +142,7 @@ FLAC__bool FLAC__memory_alloc_aligned_uint64_array(unsigned elements, FLAC__uint
        FLAC__ASSERT(0 != aligned_pointer);
        FLAC__ASSERT(unaligned_pointer != aligned_pointer);
 
-       if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
+       if(elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
                return false;
 
        pu = (FLAC__uint64*)FLAC__memory_alloc_aligned(sizeof(*pu) * elements, &u.pv);
@@ -158,7 +158,7 @@ FLAC__bool FLAC__memory_alloc_aligned_uint64_array(unsigned elements, FLAC__uint
        }
 }
 
-FLAC__bool FLAC__memory_alloc_aligned_unsigned_array(unsigned elements, unsigned **unaligned_pointer, unsigned **aligned_pointer)
+FLAC__bool FLAC__memory_alloc_aligned_unsigned_array(size_t elements, unsigned **unaligned_pointer, unsigned **aligned_pointer)
 {
        unsigned *pu; /* unaligned pointer */
        union { /* union needed to comply with C99 pointer aliasing rules */
@@ -171,7 +171,7 @@ FLAC__bool FLAC__memory_alloc_aligned_unsigned_array(unsigned elements, unsigned
        FLAC__ASSERT(0 != aligned_pointer);
        FLAC__ASSERT(unaligned_pointer != aligned_pointer);
 
-       if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
+       if(elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
                return false;
 
        pu = (unsigned*)FLAC__memory_alloc_aligned(sizeof(*pu) * elements, &u.pv);
@@ -189,7 +189,7 @@ FLAC__bool FLAC__memory_alloc_aligned_unsigned_array(unsigned elements, unsigned
 
 #ifndef FLAC__INTEGER_ONLY_LIBRARY
 
-FLAC__bool FLAC__memory_alloc_aligned_real_array(unsigned elements, FLAC__real **unaligned_pointer, FLAC__real **aligned_pointer)
+FLAC__bool FLAC__memory_alloc_aligned_real_array(size_t elements, FLAC__real **unaligned_pointer, FLAC__real **aligned_pointer)
 {
        FLAC__real *pu; /* unaligned pointer */
        union { /* union needed to comply with C99 pointer aliasing rules */
@@ -202,7 +202,7 @@ FLAC__bool FLAC__memory_alloc_aligned_real_array(unsigned elements, FLAC__real *
        FLAC__ASSERT(0 != aligned_pointer);
        FLAC__ASSERT(unaligned_pointer != aligned_pointer);
 
-       if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
+       if(elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
                return false;
 
        pu = (FLAC__real*)FLAC__memory_alloc_aligned(sizeof(*pu) * elements, &u.pv);

diff --git a/src/libFLAC/metadata_object.c b/src/libFLAC/metadata_object.c
index 9196313..d586b17 100644 (file)
--- a/src/libFLAC/metadata_object.c
+++ b/src/libFLAC/metadata_object.c
@@ -550,7 +550,7 @@ FLAC_API FLAC__StreamMetadata *FLAC__metadata_object_clone(const FLAC__StreamMet
                                break;
                        case FLAC__METADATA_TYPE_SEEKTABLE:
                                to->data.seek_table.num_points = object->data.seek_table.num_points;
-                               if(to->data.seek_table.num_points > SIZE_MAX / sizeof(FLAC__StreamMetadata_SeekPoint)) { /* overflow check */
+                               if(to->data.seek_table.num_points > UINT32_MAX / sizeof(FLAC__StreamMetadata_SeekPoint)) { /* overflow check */
                                        FLAC__metadata_object_delete(to);
                                        return 0;
                                }
@@ -943,7 +943,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_seektable_resize_points(FLAC__StreamMe
                const size_t new_size = new_num_points * sizeof(FLAC__StreamMetadata_SeekPoint);
 
                /* overflow check */
-               if((size_t)new_num_points > SIZE_MAX / sizeof(FLAC__StreamMetadata_SeekPoint))
+               if(new_num_points > UINT32_MAX / sizeof(FLAC__StreamMetadata_SeekPoint))
                        return false;
 
                FLAC__ASSERT(object->data.seek_table.num_points > 0);
@@ -1174,7 +1174,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_resize_comments(FLAC__St
                const size_t new_size = new_num_comments * sizeof(FLAC__StreamMetadata_VorbisComment_Entry);
 
                /* overflow check */
-               if((size_t)new_num_comments > SIZE_MAX / sizeof(FLAC__StreamMetadata_VorbisComment_Entry))
+               if(new_num_comments > UINT32_MAX / sizeof(FLAC__StreamMetadata_VorbisComment_Entry))
                        return false;
 
                FLAC__ASSERT(object->data.vorbis_comment.num_comments > 0);
@@ -1335,7 +1335,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_from_name_value_pa
                memcpy(entry->entry+nn+1, field_value, nv);
                entry->entry[entry->length] = '\0';
        }
-       
+
        return true;
 }
 
@@ -1491,7 +1491,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_resize_indices(FLAC__St
                const size_t new_size = new_num_indices * sizeof(FLAC__StreamMetadata_CueSheet_Index);
 
                /* overflow check */
-               if((size_t)new_num_indices > SIZE_MAX / sizeof(FLAC__StreamMetadata_CueSheet_Index))
+               if(new_num_indices > UINT32_MAX / sizeof(FLAC__StreamMetadata_CueSheet_Index))
                        return false;
 
                FLAC__ASSERT(track->num_indices > 0);
@@ -1579,7 +1579,7 @@ FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_resize_tracks(FLAC__StreamMet
                const size_t new_size = new_num_tracks * sizeof(FLAC__StreamMetadata_CueSheet_Track);
 
                /* overflow check */
-               if((size_t)new_num_tracks > SIZE_MAX / sizeof(FLAC__StreamMetadata_CueSheet_Track))
+               if(new_num_tracks > UINT32_MAX / sizeof(FLAC__StreamMetadata_CueSheet_Track))
                        return false;
 
                FLAC__ASSERT(object->data.cue_sheet.num_tracks > 0);

diff --git a/src/metaflac/options.c b/src/metaflac/options.c
index 820c95d..f2b6831 100644 (file)
--- a/src/metaflac/options.c
+++ b/src/metaflac/options.c
@@ -62,15 +62,15 @@ struct share__option long_options_[] = {
        { "set-channels", 1, 0, 0 }, /* undocumented */
        { "set-bps", 1, 0, 0 }, /* undocumented */
        { "set-total-samples", 1, 0, 0 }, /* undocumented */ /* WATCHOUT: used by test/test_flac.sh on windows */
-       { "show-vendor-tag", 0, 0, 0 }, 
-       { "show-tag", 1, 0, 0 }, 
-       { "remove-all-tags", 0, 0, 0 }, 
-       { "remove-tag", 1, 0, 0 }, 
-       { "remove-first-tag", 1, 0, 0 }, 
-       { "set-tag", 1, 0, 0 }, 
-       { "set-tag-from-file", 1, 0, 0 }, 
-       { "import-tags-from", 1, 0, 0 }, 
-       { "export-tags-to", 1, 0, 0 }, 
+       { "show-vendor-tag", 0, 0, 0 },
+       { "show-tag", 1, 0, 0 },
+       { "remove-all-tags", 0, 0, 0 },
+       { "remove-tag", 1, 0, 0 },
+       { "remove-first-tag", 1, 0, 0 },
+       { "set-tag", 1, 0, 0 },
+       { "set-tag-from-file", 1, 0, 0 },
+       { "import-tags-from", 1, 0, 0 },
+       { "export-tags-to", 1, 0, 0 },
        { "import-cuesheet-from", 1, 0, 0 },
        { "export-cuesheet-to", 1, 0, 0 },
        { "import-picture-from", 1, 0, 0 },
@@ -719,7 +719,7 @@ void append_new_operation(CommandLineOptions *options, Operation operation)
        }
        if(options->ops.capacity <= options->ops.num_operations) {
                unsigned original_capacity = options->ops.capacity;
-               if(options->ops.capacity > SIZE_MAX / 2) /* overflow check */
+               if(options->ops.capacity > UINT32_MAX / 2) /* overflow check */
                        die("out of memory allocating space for option list");
                options->ops.capacity *= 2;
                if(0 == (options->ops.operations = (Operation*)safe_realloc_mul_2op_(options->ops.operations, sizeof(Operation), /*times*/options->ops.capacity)))
@@ -740,7 +740,7 @@ void append_new_argument(CommandLineOptions *options, Argument argument)
        }
        if(options->args.capacity <= options->args.num_arguments) {
                unsigned original_capacity = options->args.capacity;
-               if(options->args.capacity > SIZE_MAX / 2) /* overflow check */
+               if(options->args.capacity > UINT32_MAX / 2) /* overflow check */
                        die("out of memory allocating space for option list");
                options->args.capacity *= 2;
                if(0 == (options->args.arguments = (Argument*)safe_realloc_mul_2op_(options->args.arguments, sizeof(Argument), /*times*/options->args.capacity)))