summaryrefslogtreecommitdiff
path: root/src/xine-engine/configfile.c
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2012-01-18 19:54:34 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2012-01-18 19:54:34 +0000
commit3119dd2de36dbd8bb9af95ab1826c15f3099b597 (patch)
tree76b0324c6e93b86550e63ad02f1154580ce79526 /src/xine-engine/configfile.c
parent7366cab446742882341e4a5304527e8b1a6965eb (diff)
parentcb6e4b4ffd49cdef83c6d025f175cf6a79705fc8 (diff)
downloadxine-lib-3119dd2de36dbd8bb9af95ab1826c15f3099b597.tar.gz
xine-lib-3119dd2de36dbd8bb9af95ab1826c15f3099b597.tar.bz2
Merge.
Diffstat (limited to 'src/xine-engine/configfile.c')
-rw-r--r--src/xine-engine/configfile.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 924fbe02a..b334dfaa5 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.c
@@ -352,7 +352,7 @@ static void config_remove(config_values_t *this, cfg_entry_t *entry, cfg_entry_t
prev->next = entry->next;
}
-static char *config_xlate_internal (const char *key, const xine_config_entry_translation_t *trans)
+static const char *config_xlate_internal (const char *key, const xine_config_entry_translation_t *trans)
{
--trans;
while ((++trans)->old_name)
@@ -1284,7 +1284,6 @@ static char* config_get_serialized_entry (config_values_t *this, const char *key
int str_default_len = 0;
int description_len = 0;
int help_len = 0;
- unsigned long output_len;
unsigned long total_len;
int value_count;
int value_len[10];