Fix a couple of -Winline warnings.

diff --git a/include/share/alloc.h b/include/share/alloc.h
index 81f922a..26fc508 100644 (file)
--- a/include/share/alloc.h
+++ b/include/share/alloc.h
@@ -60,7 +60,7 @@
 /* avoid malloc()ing 0 bytes, see:
  * https://www.securecoding.cert.org/confluence/display/seccode/MEM04-A.+Do+not+make+assumptions+about+the+result+of+allocating+0+bytes?focusedCommentId=5407003
 */
-static void *safe_malloc_(size_t size)
+static inline void *safe_malloc_(size_t size)
 {
        /* malloc(0) is undefined; FLAC src convention is to always allocate */
        if(!size)
@@ -68,7 +68,7 @@ static void *safe_malloc_(size_t size)
        return malloc(size);
 }
 
-static void *safe_calloc_(size_t nmemb, size_t size)
+static inline void *safe_calloc_(size_t nmemb, size_t size)
 {
        if(!nmemb || !size)
                return malloc(1); /* malloc(0) is undefined; FLAC src convention is to always allocate */
@@ -77,7 +77,7 @@ static void *safe_calloc_(size_t nmemb, size_t size)
 
 /*@@@@ there's probably a better way to prevent overflows when allocating untrusted sums but this works for now */
 
-static void *safe_malloc_add_2op_(size_t size1, size_t size2)
+static inline void *safe_malloc_add_2op_(size_t size1, size_t size2)
 {
        size2 += size1;
        if(size2 < size1)
@@ -85,7 +85,7 @@ static void *safe_malloc_add_2op_(size_t size1, size_t size2)
        return safe_malloc_(size2);
 }
 
-static void *safe_malloc_add_3op_(size_t size1, size_t size2, size_t size3)
+static inline void *safe_malloc_add_3op_(size_t size1, size_t size2, size_t size3)
 {
        size2 += size1;
        if(size2 < size1)
@@ -96,7 +96,7 @@ static void *safe_malloc_add_3op_(size_t size1, size_t size2, size_t size3)
        return safe_malloc_(size3);
 }
 
-static void *safe_malloc_add_4op_(size_t size1, size_t size2, size_t size3, size_t size4)
+static inline void *safe_malloc_add_4op_(size_t size1, size_t size2, size_t size3, size_t size4)
 {
        size2 += size1;
        if(size2 < size1)
@@ -110,7 +110,7 @@ static void *safe_malloc_add_4op_(size_t size1, size_t size2, size_t size3, size
        return safe_malloc_(size4);
 }
 
-static void *safe_malloc_mul_2op_(size_t size1, size_t size2)
+static inline void *safe_malloc_mul_2op_(size_t size1, size_t size2)
 #if 0
 needs support for cases where sizeof(size_t) != 4
 {
@@ -132,7 +132,7 @@ needs support for cases where sizeof(size_t) != 4
 }
 #endif
 
-static void *safe_malloc_mul_3op_(size_t size1, size_t size2, size_t size3)
+static inline void *safe_malloc_mul_3op_(size_t size1, size_t size2, size_t size3)
 {
        if(!size1 || !size2 || !size3)
                return malloc(1); /* malloc(0) is undefined; FLAC src convention is to always allocate */
@@ -145,7 +145,7 @@ static void *safe_malloc_mul_3op_(size_t size1, size_t size2, size_t size3)
 }
 
 /* size1*size2 + size3 */
-static void *safe_malloc_mul2add_(size_t size1, size_t size2, size_t size3)
+static inline void *safe_malloc_mul2add_(size_t size1, size_t size2, size_t size3)
 {
        if(!size1 || !size2)
                return safe_malloc_(size3);
@@ -155,7 +155,7 @@ static void *safe_malloc_mul2add_(size_t size1, size_t size2, size_t size3)
 }
 
 /* size1 * (size2 + size3) */
-static void *safe_malloc_muladd2_(size_t size1, size_t size2, size_t size3)
+static inline void *safe_malloc_muladd2_(size_t size1, size_t size2, size_t size3)
 {
        if(!size1 || (!size2 && !size3))
                return malloc(1); /* malloc(0) is undefined; FLAC src convention is to always allocate */
@@ -165,7 +165,7 @@ static void *safe_malloc_muladd2_(size_t size1, size_t size2, size_t size3)
        return safe_malloc_mul_2op_(size1, size2);
 }
 
-static void *safe_realloc_add_2op_(void *ptr, size_t size1, size_t size2)
+static inline void *safe_realloc_add_2op_(void *ptr, size_t size1, size_t size2)
 {
        size2 += size1;
        if(size2 < size1)
@@ -173,7 +173,7 @@ static void *safe_realloc_add_2op_(void *ptr, size_t size1, size_t size2)
        return realloc(ptr, size2);
 }
 
-static void *safe_realloc_add_3op_(void *ptr, size_t size1, size_t size2, size_t size3)
+static inline void *safe_realloc_add_3op_(void *ptr, size_t size1, size_t size2, size_t size3)
 {
        size2 += size1;
        if(size2 < size1)
@@ -184,7 +184,7 @@ static void *safe_realloc_add_3op_(void *ptr, size_t size1, size_t size2, size_t
        return realloc(ptr, size3);
 }
 
-static void *safe_realloc_add_4op_(void *ptr, size_t size1, size_t size2, size_t size3, size_t size4)
+static inline void *safe_realloc_add_4op_(void *ptr, size_t size1, size_t size2, size_t size3, size_t size4)
 {
        size2 += size1;
        if(size2 < size1)
@@ -198,7 +198,7 @@ static void *safe_realloc_add_4op_(void *ptr, size_t size1, size_t size2, size_t
        return realloc(ptr, size4);
 }
 
-static void *safe_realloc_mul_2op_(void *ptr, size_t size1, size_t size2)
+static inline void *safe_realloc_mul_2op_(void *ptr, size_t size1, size_t size2)
 {
        if(!size1 || !size2)
                return realloc(ptr, 0); /* preserve POSIX realloc(ptr, 0) semantics */
@@ -208,7 +208,7 @@ static void *safe_realloc_mul_2op_(void *ptr, size_t size1, size_t size2)
 }
 
 /* size1 * (size2 + size3) */
-static void *safe_realloc_muladd2_(void *ptr, size_t size1, size_t size2, size_t size3)
+static inline void *safe_realloc_muladd2_(void *ptr, size_t size1, size_t size2, size_t size3)
 {
        if(!size1 || (!size2 && !size3))
                return realloc(ptr, 0); /* preserve POSIX realloc(ptr, 0) semantics */

diff --git a/src/libFLAC/bitreader.c b/src/libFLAC/bitreader.c
index 707362a..c639a3e 100644 (file)
--- a/src/libFLAC/bitreader.c
+++ b/src/libFLAC/bitreader.c
@@ -439,7 +439,7 @@ FLaC__INLINE unsigned FLAC__bitreader_get_input_bits_unconsumed(const FLAC__BitR
        return (br->words-br->consumed_words)*FLAC__BITS_PER_WORD + br->bytes*8 - br->consumed_bits;
 }
 
-FLaC__INLINE FLAC__bool FLAC__bitreader_read_raw_uint32(FLAC__BitReader *br, FLAC__uint32 *val, unsigned bits)
+FLAC__bool FLAC__bitreader_read_raw_uint32(FLAC__BitReader *br, FLAC__uint32 *val, unsigned bits)
 {
        FLAC__ASSERT(0 != br);
        FLAC__ASSERT(0 != br->buffer);