From: Colin Guthrie <pulse@colin.guthr.ie>
Date: Tue, 24 Jun 2008 22:57:37 +0000 (+0100)
Subject: Use the new pa_namereg_make_valid_name() function.
X-Git-Tag: v0.9.15-test1~329^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=36f2aad5f0892e6738a8d59111c3c9017152db7e;p=platform%2Fupstream%2Fpulseaudio.git

Use the new pa_namereg_make_valid_name() function.
---

diff --git a/src/modules/module-raop-discover.c b/src/modules/module-raop-discover.c
index 7f89bb5..baa64ee 100644
--- a/src/modules/module-raop-discover.c
+++ b/src/modules/module-raop-discover.c
@@ -154,7 +154,7 @@ static void resolver_cb(
     if (event != AVAHI_RESOLVER_FOUND)
         pa_log("Resolving of '%s' failed: %s", name, avahi_strerror(avahi_client_errno(u->client)));
     else {
-        char *device = NULL, *dname, *args;
+        char *device = NULL, *dname, *vname, *args;
         char at[AVAHI_ADDRESS_STR_MAX];
         AvahiStringList *l;
         pa_module *m;
@@ -178,23 +178,24 @@ static void resolver_cb(
         else
             dname = pa_sprintf_malloc("airtunes.%s", host_name);
 
-        if (!pa_namereg_is_valid_name(dname)) {
-            pa_log("Cannot construct valid device name from credentials of service '%s'.", dname);
+        if (!(vname = pa_namereg_make_valid_name(dname))) {
+            pa_log("Cannot construct valid device name from '%s'.", dname);
             avahi_free(device);
             pa_xfree(dname);
             goto finish;
         }
+        pa_xfree(dname);
 
         /*
          TODO: allow this syntax of server name in things....
         args = pa_sprintf_malloc("server=[%s]:%u "
                                  "sink_name=%s",
                                  avahi_address_snprint(at, sizeof(at), a), port,
-                                 dname);*/
+                                 vname);*/
         args = pa_sprintf_malloc("server=%s "
                                  "sink_name=%s",
                                  avahi_address_snprint(at, sizeof(at), a),
-                                 dname);
+                                 vname);
 
         pa_log_debug("Loading module-raop-sink with arguments '%s'", args);
 
@@ -204,7 +205,7 @@ static void resolver_cb(
             tnl = NULL;
         }
 
-        pa_xfree(dname);
+        pa_xfree(vname);
         pa_xfree(args);
         avahi_free(device);
     }