diff options
| -rw-r--r-- | include/share/alloc.h | 32 | ||||
| -rw-r--r-- | src/libFLAC/bitreader.c | 2 | ||||
| -rw-r--r-- | src/libFLAC/format.c | 6 | ||||
| -rw-r--r-- | src/libFLAC/md5.c | 4 | ||||
| -rw-r--r-- | src/plugin_common/dither.c | 2 | ||||
| -rw-r--r-- | src/plugin_common/tags.c | 6 | ||||
| -rw-r--r-- | src/share/replaygain_synthesis/replaygain_synthesis.c | 6 |
7 files changed, 21 insertions, 37 deletions
diff --git a/include/share/alloc.h b/include/share/alloc.h index 9e9ed0ef..37a03961 100644 --- a/include/share/alloc.h +++ b/include/share/alloc.h @@ -44,14 +44,10 @@ # define SIZE_MAX SIZE_T_MAX #endif -#ifndef FLaC__INLINE -#define FLaC__INLINE -#endif - /* 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 FLaC__INLINE void *safe_malloc_(size_t size) +static void *safe_malloc_(size_t size) { /* malloc(0) is undefined; FLAC src convention is to always allocate */ if(!size) @@ -59,7 +55,7 @@ static FLaC__INLINE void *safe_malloc_(size_t size) return malloc(size); } -static FLaC__INLINE void *safe_calloc_(size_t nmemb, size_t size) +static 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 */ @@ -68,7 +64,7 @@ static FLaC__INLINE 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 FLaC__INLINE void *safe_malloc_add_2op_(size_t size1, size_t size2) +static void *safe_malloc_add_2op_(size_t size1, size_t size2) { size2 += size1; if(size2 < size1) @@ -76,7 +72,7 @@ static FLaC__INLINE void *safe_malloc_add_2op_(size_t size1, size_t size2) return safe_malloc_(size2); } -static FLaC__INLINE void *safe_malloc_add_3op_(size_t size1, size_t size2, size_t size3) +static void *safe_malloc_add_3op_(size_t size1, size_t size2, size_t size3) { size2 += size1; if(size2 < size1) @@ -87,7 +83,7 @@ static FLaC__INLINE void *safe_malloc_add_3op_(size_t size1, size_t size2, size_ return safe_malloc_(size3); } -static FLaC__INLINE void *safe_malloc_add_4op_(size_t size1, size_t size2, size_t size3, size_t size4) +static void *safe_malloc_add_4op_(size_t size1, size_t size2, size_t size3, size_t size4) { size2 += size1; if(size2 < size1) @@ -101,7 +97,7 @@ static FLaC__INLINE void *safe_malloc_add_4op_(size_t size1, size_t size2, size_ return safe_malloc_(size4); } -static FLaC__INLINE void *safe_malloc_mul_2op_(size_t size1, size_t size2) +static void *safe_malloc_mul_2op_(size_t size1, size_t size2) #if 0 needs support for cases where sizeof(size_t) != 4 { @@ -123,7 +119,7 @@ needs support for cases where sizeof(size_t) != 4 } #endif -static FLaC__INLINE void *safe_malloc_mul_3op_(size_t size1, size_t size2, size_t size3) +static 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 */ @@ -136,7 +132,7 @@ static FLaC__INLINE void *safe_malloc_mul_3op_(size_t size1, size_t size2, size_ } /* size1*size2 + size3 */ -static FLaC__INLINE void *safe_malloc_mul2add_(size_t size1, size_t size2, size_t size3) +static void *safe_malloc_mul2add_(size_t size1, size_t size2, size_t size3) { if(!size1 || !size2) return safe_malloc_(size3); @@ -146,7 +142,7 @@ static FLaC__INLINE void *safe_malloc_mul2add_(size_t size1, size_t size2, size_ } /* size1 * (size2 + size3) */ -static FLaC__INLINE void *safe_malloc_muladd2_(size_t size1, size_t size2, size_t size3) +static 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 */ @@ -156,7 +152,7 @@ static FLaC__INLINE void *safe_malloc_muladd2_(size_t size1, size_t size2, size_ return safe_malloc_mul_2op_(size1, size2); } -static FLaC__INLINE void *safe_realloc_add_2op_(void *ptr, size_t size1, size_t size2) +static void *safe_realloc_add_2op_(void *ptr, size_t size1, size_t size2) { size2 += size1; if(size2 < size1) @@ -164,7 +160,7 @@ static FLaC__INLINE void *safe_realloc_add_2op_(void *ptr, size_t size1, size_t return realloc(ptr, size2); } -static FLaC__INLINE void *safe_realloc_add_3op_(void *ptr, size_t size1, size_t size2, size_t size3) +static void *safe_realloc_add_3op_(void *ptr, size_t size1, size_t size2, size_t size3) { size2 += size1; if(size2 < size1) @@ -175,7 +171,7 @@ static FLaC__INLINE void *safe_realloc_add_3op_(void *ptr, size_t size1, size_t return realloc(ptr, size3); } -static FLaC__INLINE void *safe_realloc_add_4op_(void *ptr, size_t size1, size_t size2, size_t size3, size_t size4) +static void *safe_realloc_add_4op_(void *ptr, size_t size1, size_t size2, size_t size3, size_t size4) { size2 += size1; if(size2 < size1) @@ -189,7 +185,7 @@ static FLaC__INLINE void *safe_realloc_add_4op_(void *ptr, size_t size1, size_t return realloc(ptr, size4); } -static FLaC__INLINE void *safe_realloc_mul_2op_(void *ptr, size_t size1, size_t size2) +static 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 */ @@ -199,7 +195,7 @@ static FLaC__INLINE void *safe_realloc_mul_2op_(void *ptr, size_t size1, size_t } /* size1 * (size2 + size3) */ -static FLaC__INLINE void *safe_realloc_muladd2_(void *ptr, size_t size1, size_t size2, size_t size3) +static 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 2c53aab7..7bebdaa4 100644 --- a/src/libFLAC/bitreader.c +++ b/src/libFLAC/bitreader.c @@ -701,7 +701,7 @@ FLAC__bool FLAC__bitreader_read_byte_block_aligned_no_crc(FLAC__BitReader *br, F return true; } -FLaC__INLINE FLAC__bool FLAC__bitreader_read_unary_unsigned(FLAC__BitReader *br, unsigned *val) +FLAC__bool FLAC__bitreader_read_unary_unsigned(FLAC__BitReader *br, unsigned *val) #if 0 /* slow but readable version */ { unsigned bit; diff --git a/src/libFLAC/format.c b/src/libFLAC/format.c index b795ac5c..f4a913ae 100644 --- a/src/libFLAC/format.c +++ b/src/libFLAC/format.c @@ -40,10 +40,6 @@ #include "FLAC/format.h" #include "private/format.h" -#ifndef FLaC__INLINE -#define FLaC__INLINE -#endif - #ifdef min #undef min #endif @@ -323,7 +319,7 @@ FLAC_API unsigned FLAC__format_seektable_sort(FLAC__StreamMetadata_SeekTable *se * and a more clear explanation at the end of this section: * http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 */ -static FLaC__INLINE unsigned utf8len_(const FLAC__byte *utf8) +static unsigned utf8len_(const FLAC__byte *utf8) { FLAC__ASSERT(0 != utf8); if ((utf8[0] & 0x80) == 0) { diff --git a/src/libFLAC/md5.c b/src/libFLAC/md5.c index 37cef67b..ac1d2b6e 100644 --- a/src/libFLAC/md5.c +++ b/src/libFLAC/md5.c @@ -8,10 +8,6 @@ #include "private/md5.h" #include "share/alloc.h" -#ifndef FLaC__INLINE -#define FLaC__INLINE -#endif - /* * This code implements the MD5 message-digest algorithm. * The algorithm is due to Ron Rivest. This code was diff --git a/src/plugin_common/dither.c b/src/plugin_common/dither.c index 5e7e6264..6bc0b9f6 100644 --- a/src/plugin_common/dither.c +++ b/src/plugin_common/dither.c @@ -54,7 +54,7 @@ typedef struct { FLAC__int32 random; } dither_state; -static FLaC__INLINE FLAC__int32 linear_dither(unsigned source_bps, unsigned target_bps, FLAC__int32 sample, dither_state *dither, const FLAC__int32 MIN, const FLAC__int32 MAX) +static FLAC__int32 linear_dither(unsigned source_bps, unsigned target_bps, FLAC__int32 sample, dither_state *dither, const FLAC__int32 MIN, const FLAC__int32 MAX) { unsigned scalebits; FLAC__int32 output, mask, random; diff --git a/src/plugin_common/tags.c b/src/plugin_common/tags.c index cd41d8e1..46da829e 100644 --- a/src/plugin_common/tags.c +++ b/src/plugin_common/tags.c @@ -48,7 +48,7 @@ static FLaC__INLINE size_t local__wide_strlen(const FLAC__uint16 *s) * and a more clear explanation at the end of this section: * http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 */ -static FLaC__INLINE size_t local__utf8len(const FLAC__byte *utf8) +static size_t local__utf8len(const FLAC__byte *utf8) { FLAC__ASSERT(0 != utf8); if ((utf8[0] & 0x80) == 0) { @@ -90,7 +90,7 @@ static FLaC__INLINE size_t local__utf8len(const FLAC__byte *utf8) } -static FLaC__INLINE size_t local__utf8_to_ucs2(const FLAC__byte *utf8, FLAC__uint16 *ucs2) +static size_t local__utf8_to_ucs2(const FLAC__byte *utf8, FLAC__uint16 *ucs2) { const size_t len = local__utf8len(utf8); @@ -155,7 +155,7 @@ static FLaC__INLINE size_t local__ucs2len(FLAC__uint16 ucs2) return 3; } -static FLaC__INLINE size_t local__ucs2_to_utf8(FLAC__uint16 ucs2, FLAC__byte *utf8) +static size_t local__ucs2_to_utf8(FLAC__uint16 ucs2, FLAC__byte *utf8) { if (ucs2 < 0x080) { utf8[0] = (FLAC__byte)ucs2; diff --git a/src/share/replaygain_synthesis/replaygain_synthesis.c b/src/share/replaygain_synthesis/replaygain_synthesis.c index 2a6d9d68..9526c892 100644 --- a/src/share/replaygain_synthesis/replaygain_synthesis.c +++ b/src/share/replaygain_synthesis/replaygain_synthesis.c @@ -44,10 +44,6 @@ #include "replaygain_synthesis.h" #include "FLAC/assert.h" -#ifndef FLaC__INLINE -#define FLaC__INLINE -#endif - /* adjust for compilers that can't understand using LL suffix for int64_t literals */ #ifdef _MSC_VER #define FLAC__I64L(x) x @@ -236,7 +232,7 @@ void FLAC__replaygain_synthesis__init_dither_context(DitherContext *d, int bits, * the following is based on parts of wavegain.c */ -static FLaC__INLINE FLAC__int64 dither_output_(DitherContext *d, FLAC__bool do_dithering, int shapingtype, int i, double Sum, int k) +static FLAC__int64 dither_output_(DitherContext *d, FLAC__bool do_dithering, int shapingtype, int i, double Sum, int k) { union { double d; |