From 323dc5bfb9c07d7a255dedc64fc799bb2ca5ae40 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Tue, 26 Jan 2016 14:57:32 +0200 Subject: [PATCH] device-manager: improve logging about non-existing data Previously a missing key would cause this kind of log output: D: [pulseaudio] module-device-manager.c: Database contains invalid data for key: sink:auto_null (probably pre-v1.0 data) D: [pulseaudio] module-device-manager.c: Attempting to load legacy (pre-v1.0) data for key: sink:auto_null D: [pulseaudio] module-device-manager.c: Size does not match. D: [pulseaudio] module-device-manager.c: Unable to load legacy (pre-v1.0) data for key: sink:auto_null. Ignoring. That is now replaced with D: [pulseaudio] module-device-manager.c: Database contains no data for key: sink:auto_null --- src/modules/module-device-manager.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/module-device-manager.c b/src/modules/module-device-manager.c index f125bddc2..1a0a53e12 100644 --- a/src/modules/module-device-manager.c +++ b/src/modules/module-device-manager.c @@ -292,8 +292,10 @@ static struct entry* entry_read(struct userdata *u, const char *name) { pa_zero(data); - if (!pa_database_get(u->database, &key, &data)) - goto fail; + if (!pa_database_get(u->database, &key, &data)) { + pa_log_debug("Database contains no data for key: %s", name); + return NULL; + } t = pa_tagstruct_new_fixed(data.data, data.size); e = entry_new();