mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-10 13:29:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

do not export name validity checking routes and apply them only to sink/source names, not sample names

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1199 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-08-11 16:58:21 +00:00
parent e1316f5728
commit 539612a5c2
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/pulsecore/namereg.c
View file

@ -54,7 +54,7 @@ static int is_valid_char(char c) {
c == '_';
}
int pa_namereg_is_valid_name(const char *name) {
static int is_valid_name(const char *name) {
const char *c;
if (*name == 0)
@ -70,7 +70,7 @@ int pa_namereg_is_valid_name(const char *name) {
return 1;
}
char* pa_namereg_cleanup_name(const char *name) {
static char* cleanup_name(const char *name) {
const char *a;
char *b, *n;
@ -109,12 +109,13 @@ const char *pa_namereg_register(pa_core *c, const char *name, pa_namereg_type_t
if (!*name)
return NULL;
if (!pa_namereg_is_valid_name(name)) {
if ((type == PA_NAMEREG_SINK || type == PA_NAMEREG_SOURCE) &&
!is_valid_name(name) ) {
if (fail)
return NULL;
if (!(name = n = pa_namereg_cleanup_name(name)))
if (!(name = n = cleanup_name(name)))
return NULL;
}
@ -253,7 +254,7 @@ int pa_namereg_set_default(pa_core*c, const char *name, pa_namereg_type_t type)
if (name && *s && !strcmp(name, *s))
return 0;
if (!pa_namereg_is_valid_name(name))
if (!is_valid_name(name))
return -1;
pa_xfree(*s);

4
src/pulsecore/namereg.h
View file

@ -34,10 +34,6 @@ typedef enum pa_namereg_type {
void pa_namereg_free(pa_core *c);
int pa_namereg_is_valid_name(const char *name);
char* pa_namereg_cleanup_name(const char *name);
const char *pa_namereg_register(pa_core *c, const char *name, pa_namereg_type_t type, void *data, int fail);
void pa_namereg_unregister(pa_core *c, const char *name);
void* pa_namereg_get(pa_core *c, const char *name, pa_namereg_type_t type, int autoload);