builder: make _rewind part of _reset()

_reset() should also rewind the work that has been done. We don't
need _rewind() anymore then.
This commit is contained in:
Wim Taymans 2019-06-26 12:45:36 +02:00
parent 350e8051a7
commit 891c5fd79d
2 changed files with 9 additions and 13 deletions

View file

@ -78,7 +78,11 @@ spa_pod_builder_set_callbacks(struct spa_pod_builder *builder,
static inline void
spa_pod_builder_reset(struct spa_pod_builder *builder, struct spa_pod_builder_state *state)
{
struct spa_pod_frame *f;
uint32_t size = builder->state.offset - state->offset;
builder->state = *state;
for (f = builder->state.frame; f ; f = f->parent)
f->pod.size -= size;
}
static inline void spa_pod_builder_init(struct spa_pod_builder *builder, void *data, uint32_t size)
@ -173,15 +177,6 @@ static inline void *spa_pod_builder_pop(struct spa_pod_builder *builder, struct
return pod;
}
static inline void spa_pod_builder_rewind(struct spa_pod_builder *builder, uint32_t offset)
{
struct spa_pod_frame *f;
uint32_t size = builder->state.offset - offset;
builder->state.offset -= size;
for (f = builder->state.frame; f ; f = f->parent)
f->pod.size -= size;
}
static inline int
spa_pod_builder_primitive(struct spa_pod_builder *builder, const struct spa_pod *p)
{