Merge commit 'origin/master-tx' into master-tx

[pulseaudio] / src / pulsecore / namereg.c

diff --git a/src/pulsecore/namereg.c b/src/pulsecore/namereg.c
index 38d308c1f629227d59e653148a7b739b205aedea..ecd8def8d6485310d174dc48aba84a21f2a807db 100644 (file)
--- a/src/pulsecore/namereg.c
+++ b/src/pulsecore/namereg.c
@@ -45,12 +45,13 @@ struct namereg_entry {
     void *data;
 };
 
-static int is_valid_char(char c) {
+static pa_bool_t is_valid_char(char c) {
     return
         (c >= 'a' && c <= 'z') ||
         (c >= 'A' && c <= 'Z') ||
         (c >= '0' && c <= '9') ||
         c == '.' ||
+        c == '-' ||
         c == '_';
 }
 
@@ -70,17 +71,17 @@ pa_bool_t pa_namereg_is_valid_name(const char *name) {
     return TRUE;
 }
 
-const char* pa_namereg_make_valid_name(const char *name) {
+char* pa_namereg_make_valid_name(const char *name) {
     const char *a;
     char *b, *n;
 
     if (*name == 0)
         return NULL;
 
-    n = pa_xnew(char, strlen(name)+1);
+    n = pa_xmalloc(strlen(name)+1);
 
     for (a = name, b = n; *a && (a-name < PA_NAME_MAX); a++, b++)
-        *b = is_valid_char(*a) ? *a : '_';
+        *b = (char) (is_valid_char(*a) ? *a : '_');
 
     *b = 0;
 
@@ -97,7 +98,7 @@ void pa_namereg_free(pa_core *c) {
     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, int fail) {
+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;
 
@@ -109,7 +110,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) &&
-        !pa_namereg_is_valid_name(name) ) {
+        !pa_namereg_is_valid_name(name)) {
 
         if (fail)
             return NULL;
@@ -136,7 +137,7 @@ const char *pa_namereg_register(pa_core *c, const char *name, pa_namereg_type_t
             return NULL;
         }
 
-        k = pa_xnew(char, l+4);
+        k = pa_xmalloc(l+4);
 
         for (i = 2; i <= 99; i++) {
             pa_snprintf(k, l+4, "%s.%u", name, i);