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

authkey: Rename pa_authkey_load_auto() to pa_authkey_load()

Browse source 
pa_authkey_load() was removed earlier, so the _auto suffix isn't
necessary any more.
This commit is contained in:
Tanu Kaskinen 2014-06-08 16:32:56 +03:00
parent a54d357729
commit 71ead4989a
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/pulse/client-conf.c
View file

@ -174,7 +174,7 @@ int pa_client_conf_load_cookie(pa_client_conf *c, uint8_t *cookie, size_t cookie
pa_assert(cookie_length > 0);
if (c->cookie_file_from_env) {
r = pa_authkey_load_auto(c->cookie_file_from_env, true, cookie, cookie_length);
r = pa_authkey_load(c->cookie_file_from_env, true, cookie, cookie_length);
if (r >= 0)
return 0;
@ -192,7 +192,7 @@ int pa_client_conf_load_cookie(pa_client_conf *c, uint8_t *cookie, size_t cookie
}
if (c->cookie_file_from_application) {
r = pa_authkey_load_auto(c->cookie_file_from_application, true, cookie, cookie_length);
r = pa_authkey_load(c->cookie_file_from_application, true, cookie, cookie_length);
if (r >= 0)
return 0;
@ -201,7 +201,7 @@ int pa_client_conf_load_cookie(pa_client_conf *c, uint8_t *cookie, size_t cookie
}
if (c->cookie_file_from_client_conf) {
r = pa_authkey_load_auto(c->cookie_file_from_client_conf, true, cookie, cookie_length);
r = pa_authkey_load(c->cookie_file_from_client_conf, true, cookie, cookie_length);
if (r >= 0)
return 0;
@ -209,15 +209,15 @@ int pa_client_conf_load_cookie(pa_client_conf *c, uint8_t *cookie, size_t cookie
pa_cstrerror(errno));
}
r = pa_authkey_load_auto(PA_NATIVE_COOKIE_FILE, false, cookie, cookie_length);
r = pa_authkey_load(PA_NATIVE_COOKIE_FILE, false, cookie, cookie_length);
if (r >= 0)
return 0;
r = pa_authkey_load_auto(PA_NATIVE_COOKIE_FILE_FALLBACK, false, cookie, cookie_length);
r = pa_authkey_load(PA_NATIVE_COOKIE_FILE_FALLBACK, false, cookie, cookie_length);
if (r >= 0)
return 0;
r = pa_authkey_load_auto(PA_NATIVE_COOKIE_FILE, true, cookie, cookie_length);
r = pa_authkey_load(PA_NATIVE_COOKIE_FILE, true, cookie, cookie_length);
if (r >= 0)
return 0;