mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-14 06:59:53 -05:00
get rid of nonsensical late initialization of namereg/scache and things
This commit is contained in:
parent
4a06af6081
commit
746dc2ac19
9 changed files with 41 additions and 102 deletions
|
|
@ -87,16 +87,6 @@ char* pa_namereg_make_valid_name(const char *name) {
|
|||
return n;
|
||||
}
|
||||
|
||||
void pa_namereg_free(pa_core *c) {
|
||||
pa_assert(c);
|
||||
|
||||
if (!c->namereg)
|
||||
return;
|
||||
|
||||
pa_assert(pa_hashmap_size(c->namereg) == 0);
|
||||
pa_hashmap_free(c->namereg, NULL, NULL);
|
||||
}
|
||||
|
||||
const char *pa_namereg_register(pa_core *c, const char *name, pa_namereg_type_t type, void *data, pa_bool_t fail) {
|
||||
struct namereg_entry *e;
|
||||
char *n = NULL;
|
||||
|
|
@ -118,9 +108,6 @@ const char *pa_namereg_register(pa_core *c, const char *name, pa_namereg_type_t
|
|||
return NULL;
|
||||
}
|
||||
|
||||
if (!c->namereg)
|
||||
c->namereg = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
|
||||
|
||||
if ((e = pa_hashmap_get(c->namereg, name)) && fail) {
|
||||
pa_xfree(n);
|
||||
return NULL;
|
||||
|
|
@ -210,7 +197,7 @@ void* pa_namereg_get(pa_core *c, const char *name, pa_namereg_type_t type) {
|
|||
if (*name == '@' || !name || !pa_namereg_is_valid_name(name))
|
||||
return NULL;
|
||||
|
||||
if (c->namereg && (e = pa_hashmap_get(c->namereg, name)))
|
||||
if ((e = pa_hashmap_get(c->namereg, name)))
|
||||
if (e->type == type)
|
||||
return e->data;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue