diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-01-10 21:42:53 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-01-10 21:42:53 +0000 |
| commit | f5646d5518c1233f8e048727e7f92921f8e5b9af (patch) | |
| tree | 75f8735c193c7ff467920128cd158aee4b4c3c69 /src/xine-engine/configfile.c | |
| parent | c4888045440dadbd2e861b7cf3dae6065e895385 (diff) | |
| parent | 8f9bca37fbfd25506fe719898c8cf3bfc62704e8 (diff) | |
| download | xine-lib-f5646d5518c1233f8e048727e7f92921f8e5b9af.tar.gz xine-lib-f5646d5518c1233f8e048727e7f92921f8e5b9af.tar.bz2 | |
Merge.
Diffstat (limited to 'src/xine-engine/configfile.c')
| -rw-r--r-- | src/xine-engine/configfile.c | 3 |
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]; |