summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/pulsecore/namereg.c14
-rw-r--r--src/pulsecore/namereg.h3
2 files changed, 10 insertions, 7 deletions
diff --git a/src/pulsecore/namereg.c b/src/pulsecore/namereg.c
index fe2be467..fe520384 100644
--- a/src/pulsecore/namereg.c
+++ b/src/pulsecore/namereg.c
@@ -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);
diff --git a/src/pulsecore/namereg.h b/src/pulsecore/namereg.h
index 350ba0f6..d0db9e81 100644
--- a/src/pulsecore/namereg.h
+++ b/src/pulsecore/namereg.h
@@ -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