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

Use the new pa_namereg_make_valid_name() function.

Browse source
This commit is contained in:
Colin Guthrie 2008-06-24 23:57:37 +01:00
parent 0ff75aea05
commit 36f2aad5f0
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/module-raop-discover.c
View file

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