mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

tagstruct: Replace dynamic flag with type

Browse source 
... in order to prepare for a new type _APPENDED

remove the assert() for dynamic in pa_tagstruct_data() as
the function makes sense for all tagstruct types (and the returned pointer
is const)

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
This commit is contained in:
Peter Meerwald 2014-10-22 14:52:23 +02:00 • committed by Peter Meerwald
parent 037fdf485f
commit b96971941b
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/pulsecore/tagstruct.c
View file

@ -45,7 +45,10 @@ struct pa_tagstruct {
size_t length, allocated; size_t length, allocated;
size_t rindex; size_t rindex;
bool dynamic; enum {
PA_TAGSTRUCT_FIXED,
PA_TAGSTRUCT_DYNAMIC,
} type;
}; };
pa_tagstruct *pa_tagstruct_new(void) { pa_tagstruct *pa_tagstruct_new(void) {
@ -55,7 +58,7 @@ pa_tagstruct *pa_tagstruct_new(void) {
t->data = NULL; t->data = NULL;
t->allocated = t->length = 0; t->allocated = t->length = 0;
t->rindex = 0; t->rindex = 0;
t->dynamic = true; t->type = PA_TAGSTRUCT_DYNAMIC;
return t; return t;
} }
@ -69,7 +72,7 @@ pa_tagstruct *pa_tagstruct_new_fixed(const uint8_t* data, size_t length) {
t->data = (uint8_t*) data; t->data = (uint8_t*) data;
t->allocated = t->length = length; t->allocated = t->length = length;
t->rindex = 0; t->rindex = 0;
t->dynamic = false; t->type = PA_TAGSTRUCT_FIXED;
return t; return t;
} }
@ -77,7 +80,7 @@ pa_tagstruct *pa_tagstruct_new_fixed(const uint8_t* data, size_t length) {
void pa_tagstruct_free(pa_tagstruct*t) { void pa_tagstruct_free(pa_tagstruct*t) {
pa_assert(t); pa_assert(t);
if (t->dynamic) if (t->type == PA_TAGSTRUCT_DYNAMIC)
pa_xfree(t->data); pa_xfree(t->data);
pa_xfree(t); pa_xfree(t);
} }
@ -86,7 +89,7 @@ uint8_t* pa_tagstruct_free_data(pa_tagstruct*t, size_t *l) {
uint8_t *p; uint8_t *p;
pa_assert(t); pa_assert(t);
pa_assert(t->dynamic); pa_assert(t->type == PA_TAGSTRUCT_DYNAMIC);
pa_assert(l); pa_assert(l);
p = t->data; p = t->data;
@ -97,7 +100,7 @@ uint8_t* pa_tagstruct_free_data(pa_tagstruct*t, size_t *l) {
static inline void extend(pa_tagstruct*t, size_t l) { static inline void extend(pa_tagstruct*t, size_t l) {
pa_assert(t); pa_assert(t);
pa_assert(t->dynamic); pa_assert(t->type != PA_TAGSTRUCT_FIXED);
if (t->length+l <= t->allocated) if (t->length+l <= t->allocated)
return; return;
@ -449,7 +452,6 @@ int pa_tagstruct_eof(pa_tagstruct*t) {
const uint8_t* pa_tagstruct_data(pa_tagstruct*t, size_t *l) { const uint8_t* pa_tagstruct_data(pa_tagstruct*t, size_t *l) {
pa_assert(t); pa_assert(t);
pa_assert(t->dynamic);
pa_assert(l); pa_assert(l);
*l = t->length; *l = t->length;