From 158c5f2072b8a67a0c9e8d8523908a9d89188b1c Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 1 Jan 2008 02:29:17 +0000 Subject: Skip deleted keys - should any ever occur! - while saving the config. --- src/xine-engine/configfile.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/xine-engine/configfile.c') diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index 2f5e6214a..2dc89f0af 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.c @@ -1060,7 +1060,7 @@ void xine_config_save (xine_t *xine, const char *filename) { if (!entry->key[0]) /* deleted key */ - continue; + goto next; lprintf ("saving key '%s'\n", entry->key); @@ -1130,6 +1130,7 @@ void xine_config_save (xine_t *xine, const char *filename) { break; } + next: entry = entry->next; } pthread_mutex_unlock(&this->config_lock); -- cgit v1.2.3 From 5e136f7de2c0bc943edf7ac4d7cfadc10ce8c4a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Wed, 2 Jan 2008 19:00:37 +0100 Subject: The config translator returns a non-constant string. --- src/xine-engine/configfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/xine-engine/configfile.c') diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index 91931eef6..3e3c0f7b5 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.c @@ -347,7 +347,7 @@ static void config_remove(config_values_t *this, cfg_entry_t *entry, cfg_entry_t prev->next = entry->next; } -static const char *config_xlate_internal (const char *key, const xine_config_entry_translation_t *trans) +static char *config_xlate_internal (const char *key, const xine_config_entry_translation_t *trans) { --trans; while ((++trans)->old_name) -- cgit v1.2.3