summaryrefslogtreecommitdiff
path: root/src/xine-engine/configfile.c
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-01-05 00:44:49 +0100
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-01-05 00:44:49 +0100
commitc81c9deccc79646bd7ac3f1759a4a3e4fb8a88af (patch)
treeb39027bf19757a904f9d306085d8744046f24a1f /src/xine-engine/configfile.c
parent119076c9300e2e2a816dc1a6ca32ba77f338b20c (diff)
parenta2a95425350da93551388acdca8a00818a34c317 (diff)
downloadxine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.gz
xine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.bz2
Merge from 1.2.
Diffstat (limited to 'src/xine-engine/configfile.c')
-rw-r--r--src/xine-engine/configfile.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 8f3f9c684..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)
@@ -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);