diff options
author | Nils Wallménius <nils@rockbox.org> | 2009-08-20 16:47:44 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2009-08-20 16:47:44 +0000 |
commit | 3200d04d75c5e7556ed8880b155533e881a4d1e1 (patch) | |
tree | 188e2c9525b25cb8922a14766e51ab02bad3f831 /apps/plugins/mpegplayer/mpeg_settings.c | |
parent | 0a1728444882cdbc6a0c815bd88464de25ad94e9 (diff) | |
download | rockbox-3200d04d75c5e7556ed8880b155533e881a4d1e1.tar.gz rockbox-3200d04d75c5e7556ed8880b155533e881a4d1e1.zip |
Make the formatter functions used by the settings return a pointer to avoid usless copying of lang strings, this brought with it a long chain of const correctness and a few random cleanups
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22440 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/mpegplayer/mpeg_settings.c')
-rw-r--r-- | apps/plugins/mpegplayer/mpeg_settings.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 62293d101f..3868d759f6 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -317,7 +317,7 @@ static bool mpeg_set_int(const char *string, const char *unit, | |||
317 | void (*function)(int), int step, | 317 | void (*function)(int), int step, |
318 | int min, | 318 | int min, |
319 | int max, | 319 | int max, |
320 | void (*formatter)(char*, size_t, int, const char*)) | 320 | const char* (*formatter)(char*, size_t, int, const char*)) |
321 | { | 321 | { |
322 | mpeg_menu_sysevent_clear(); | 322 | mpeg_menu_sysevent_clear(); |
323 | 323 | ||
@@ -350,15 +350,16 @@ static void backlight_brightness_function(int value) | |||
350 | mpeg_backlight_update_brightness(value); | 350 | mpeg_backlight_update_brightness(value); |
351 | } | 351 | } |
352 | 352 | ||
353 | static void backlight_brightness_formatter(char *buf, size_t length, | 353 | static const char* backlight_brightness_formatter(char *buf, size_t length, |
354 | int value, const char *input) | 354 | int value, const char *input) |
355 | { | 355 | { |
356 | (void)input; | ||
357 | |||
356 | if (value < 0) | 358 | if (value < 0) |
357 | rb->strlcpy(buf, BACKLIGHT_OPTION_DEFAULT, length); | 359 | return BACKLIGHT_OPTION_DEFAULT; |
358 | else | 360 | else |
359 | rb->snprintf(buf, length, "%d", value + MIN_BRIGHTNESS_SETTING); | 361 | rb->snprintf(buf, length, "%d", value + MIN_BRIGHTNESS_SETTING); |
360 | 362 | return buf; | |
361 | (void)input; | ||
362 | } | 363 | } |
363 | #endif /* HAVE_BACKLIGHT_BRIGHTNESS */ | 364 | #endif /* HAVE_BACKLIGHT_BRIGHTNESS */ |
364 | 365 | ||