export pa_namereg_is_valid_name()

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1981 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-10-29 20:01:49 +00:00
parent 0ce32bd40c
commit 9ca7ed1958
2 changed files with 10 additions and 7 deletions

View file

@ -56,20 +56,20 @@ static int is_valid_char(char c) {
c == '_';
}
static int is_valid_name(const char *name) {
pa_bool_t pa_namereg_is_valid_name(const char *name) {
const char *c;
if (*name == 0)
return 0;
return FALSE;
for (c = name; *c && (c-name < PA_NAME_MAX); c++)
if (!is_valid_char(*c))
return 0;
return FALSE;
if (*c)
return 0;
return FALSE;
return 1;
return TRUE;
}
static char* cleanup_name(const char *name) {
@ -111,7 +111,7 @@ const char *pa_namereg_register(pa_core *c, const char *name, pa_namereg_type_t
return NULL;
if ((type == PA_NAMEREG_SINK || type == PA_NAMEREG_SOURCE) &&
!is_valid_name(name) ) {
!pa_namereg_is_valid_name(name) ) {
if (fail)
return NULL;
@ -253,7 +253,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 (!is_valid_name(name))
if (!pa_namereg_is_valid_name(name))
return -1;
pa_xfree(*s);

View file

@ -25,6 +25,7 @@
***/
#include <pulsecore/core.h>
#include <pulsecore/macro.h>
#define PA_NAME_MAX 128
@ -44,4 +45,6 @@ int pa_namereg_set_default(pa_core*c, const char *name, pa_namereg_type_t type);
const char *pa_namereg_get_default_sink_name(pa_core *c);
const char *pa_namereg_get_default_source_name(pa_core *c);
pa_bool_t pa_namereg_is_valid_name(const char *name);
#endif