Skip to content

M
mpd
Commit 172a1dbd authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

pcm_byteswap: converted NULL checks to assertions

It is illegal to pass a NULL buffer to pcm_byteswap_X(). The result of this is that pcm_byteswap_X() never returns NULL.
parent c5a662f4
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 10 deletions
src/pcm_byteswap.c
View file @ 172a1dbd
...@@ -38,8 +38,7 @@ const int16_t *pcm_byteswap_16(struct pcm_buffer *buffer, ...@@ -38,8 +38,7 @@ const int16_t *pcm_byteswap_16(struct pcm_buffer *buffer,
unsigned i; unsigned i;
int16_t *buf = pcm_buffer_get(buffer, len); int16_t *buf = pcm_buffer_get(buffer, len);
if (!buf) assert(buf != NULL);
return NULL;
for (i = 0; i < len / 2; i++) for (i = 0; i < len / 2; i++)
buf[i] = swab16(src[i]); buf[i] = swab16(src[i]);
...@@ -61,8 +60,7 @@ const int32_t *pcm_byteswap_32(struct pcm_buffer *buffer, ...@@ -61,8 +60,7 @@ const int32_t *pcm_byteswap_32(struct pcm_buffer *buffer,
unsigned i; unsigned i;
int32_t *buf = pcm_buffer_get(buffer, len); int32_t *buf = pcm_buffer_get(buffer, len);
if (!buf) assert(buf != NULL);
return NULL;
for (i = 0; i < len / 4; i++) for (i = 0; i < len / 4; i++)
buf[i] = swab32(src[i]); buf[i] = swab32(src[i]);
......
src/pcm_convert.c
View file @ 172a1dbd
...@@ -88,8 +88,7 @@ pcm_convert_16(struct pcm_convert_state *state, ...@@ -88,8 +88,7 @@ pcm_convert_16(struct pcm_convert_state *state,
if (dest_format->reverse_endian) { if (dest_format->reverse_endian) {
buf = pcm_byteswap_16(&state->byteswap_buffer, buf, len); buf = pcm_byteswap_16(&state->byteswap_buffer, buf, len);
if (!buf) assert(buf != NULL);
g_error("pcm_byteswap_16() failed");
} }
*dest_size_r = len; *dest_size_r = len;
...@@ -131,8 +130,7 @@ pcm_convert_24(struct pcm_convert_state *state, ...@@ -131,8 +130,7 @@ pcm_convert_24(struct pcm_convert_state *state,
if (dest_format->reverse_endian) { if (dest_format->reverse_endian) {
buf = pcm_byteswap_32(&state->byteswap_buffer, buf, len); buf = pcm_byteswap_32(&state->byteswap_buffer, buf, len);
if (!buf) assert(buf != NULL);
g_error("pcm_byteswap_32() failed");
} }
*dest_size_r = len; *dest_size_r = len;
...@@ -174,8 +172,7 @@ pcm_convert_32(struct pcm_convert_state *state, ...@@ -174,8 +172,7 @@ pcm_convert_32(struct pcm_convert_state *state,
if (dest_format->reverse_endian) { if (dest_format->reverse_endian) {
buf = pcm_byteswap_32(&state->byteswap_buffer, buf, len); buf = pcm_byteswap_32(&state->byteswap_buffer, buf, len);
if (!buf) assert(buf != NULL);
g_error("pcm_byteswap_32() failed");
} }
*dest_size_r = len; *dest_size_r = len;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment