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

module-card/device-restore: Do not legacy load an empty entry

Browse source 
There is no use in trying to load data in legacy format, if we
already know that there is no data at all.
Also clarify in the debug message whether there is invalid data
or no data at all.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
This commit is contained in:
David Henningsson 2014-10-20 16:19:36 +02:00
parent eaa80baea9
commit cc7c626e69
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/module-card-restore.c
View file

@ -269,8 +269,10 @@ static struct entry* entry_read(struct userdata *u, const char *name) {
pa_zero(data); pa_zero(data);
if (!pa_database_get(u->database, &key, &data)) if (!pa_database_get(u->database, &key, &data)) {
goto fail; pa_log_debug("Database contains no data for key: %s", name);
return NULL;
}
t = pa_tagstruct_new(data.data, data.size); t = pa_tagstruct_new(data.data, data.size);
e = entry_new(); e = entry_new();

8
src/modules/module-device-restore.c
View file

@ -233,8 +233,10 @@ static struct entry* entry_read(struct userdata *u, const char *name) {
pa_zero(data); pa_zero(data);
if (!pa_database_get(u->database, &key, &data)) if (!pa_database_get(u->database, &key, &data)) {
goto fail; pa_log_debug("Database contains no data for key: %s", name);
return NULL;
}
t = pa_tagstruct_new(data.data, data.size); t = pa_tagstruct_new(data.data, data.size);
e = entry_new(); e = entry_new();
@ -477,7 +479,7 @@ fail:
} }
#endif #endif
pa_log_debug("Database contains invalid data for key: %s", name); pa_log_debug("Database contains no (or invalid) data for key: %s", name);
pa_xfree(name); pa_xfree(name);