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

some modernizations

Browse source
This commit is contained in:
Lennart Poettering 2008-06-27 19:11:28 +02:00
parent 12278f4c83
commit c0f97aa580
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/pulsecore/dynarray.c
View file

@ -1,7 +1,7 @@
/*** /***
This file is part of PulseAudio. This file is part of PulseAudio.
Copyright 2004-2006 Lennart Poettering Copyright 2004-2008 Lennart Poettering
PulseAudio is free software; you can redistribute it and/or modify PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as it under the terms of the GNU Lesser General Public License as
@ -41,21 +41,23 @@ struct pa_dynarray {
pa_dynarray* pa_dynarray_new(void) { pa_dynarray* pa_dynarray_new(void) {
pa_dynarray *a; pa_dynarray *a;
a = pa_xnew(pa_dynarray, 1); a = pa_xnew(pa_dynarray, 1);
a->data = NULL; a->data = NULL;
a->n_entries = 0; a->n_entries = 0;
a->n_allocated = 0; a->n_allocated = 0;
return a; return a;
} }
void pa_dynarray_free(pa_dynarray* a, void (*func)(void *p, void *userdata), void *userdata) { void pa_dynarray_free(pa_dynarray* a, pa_free2_cb_t free_func, void *userdata) {
unsigned i; unsigned i;
pa_assert(a); pa_assert(a);
if (func) if (free_func)
for (i = 0; i < a->n_entries; i++) for (i = 0; i < a->n_entries; i++)
if (a->data[i]) if (a->data[i])
func(a->data[i], userdata); free_func(a->data[i], userdata);
pa_xfree(a->data); pa_xfree(a->data);
pa_xfree(a); pa_xfree(a);
@ -89,6 +91,7 @@ unsigned pa_dynarray_append(pa_dynarray*a, void *p) {
i = a->n_entries; i = a->n_entries;
pa_dynarray_put(a, i, p); pa_dynarray_put(a, i, p);
return i; return i;
} }

10
src/pulsecore/dynarray.h
View file

@ -1,10 +1,10 @@
#ifndef foodynarrayhfoo #ifndef foopulsecoredynarrayhfoo
#define foodynarrayhfoo #define foopulsecoredynarrayhfoo
/*** /***
This file is part of PulseAudio. This file is part of PulseAudio.
Copyright 2004-2006 Lennart Poettering Copyright 2004-2008 Lennart Poettering
PulseAudio is free software; you can redistribute it and/or modify PulseAudio is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as it under the terms of the GNU Lesser General Public License as
@ -22,6 +22,8 @@
USA. USA.
***/ ***/
#include <pulsecore/idxset.h>
typedef struct pa_dynarray pa_dynarray; typedef struct pa_dynarray pa_dynarray;
/* Implementation of a simple dynamically sized array. The array /* Implementation of a simple dynamically sized array. The array
@ -32,7 +34,7 @@ pa_dynarray* pa_dynarray_new(void);
/* Free the array calling the specified function for every entry in /* Free the array calling the specified function for every entry in
* the array. The function may be NULL. */ * the array. The function may be NULL. */
void pa_dynarray_free(pa_dynarray* a, void (*func)(void *p, void *userdata), void *userdata); void pa_dynarray_free(pa_dynarray* a, pa_free2_cb_t free_func, void *userdata);
/* Store p at position i in the array */ /* Store p at position i in the array */
void pa_dynarray_put(pa_dynarray*a, unsigned i, void *p); void pa_dynarray_put(pa_dynarray*a, unsigned i, void *p);