diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-10-20 21:54:44 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-10-20 21:54:44 +0000 |
commit | 774bacc692b4d5c7b769bb88d24e182db9e4656f (patch) | |
tree | 07c5ed05c9d46145c783bd1de5062731e6babb32 /apps/settings.c | |
parent | 872852639fc52bcdb2cc8199fed60f81c7cad1f9 (diff) | |
download | rockbox-774bacc692b4d5c7b769bb88d24e182db9e4656f.tar.gz rockbox-774bacc692b4d5c7b769bb88d24e182db9e4656f.zip |
Correct wrong usage of event callbacks all over the place. It's not supposed to return anything, and should take a data parameter.
Fixing it because correcting the event api prototypes causes many warnings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23301 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/settings.c b/apps/settings.c index 7a36a0ee1d..f12bd92bfd 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -568,17 +568,17 @@ static bool settings_write_config(const char* filename, int options) | |||
568 | return true; | 568 | return true; |
569 | } | 569 | } |
570 | #ifndef HAVE_RTC_RAM | 570 | #ifndef HAVE_RTC_RAM |
571 | static bool flush_global_status_callback(void) | 571 | static void flush_global_status_callback(void *data) |
572 | { | 572 | { |
573 | return write_nvram_data(nvram_buffer,NVRAM_BLOCK_SIZE); | 573 | (void)data; |
574 | write_nvram_data(nvram_buffer,NVRAM_BLOCK_SIZE); | ||
574 | } | 575 | } |
575 | #endif | 576 | #endif |
576 | static bool flush_config_block_callback(void) | 577 | static void flush_config_block_callback(void *data) |
577 | { | 578 | { |
578 | bool r1, r2; | 579 | (void)data; |
579 | r1 = write_nvram_data(nvram_buffer,NVRAM_BLOCK_SIZE); | 580 | write_nvram_data(nvram_buffer,NVRAM_BLOCK_SIZE); |
580 | r2 = settings_write_config(CONFIGFILE, SETTINGS_SAVE_CHANGED); | 581 | settings_write_config(CONFIGFILE, SETTINGS_SAVE_CHANGED); |
581 | return r1 || r2; | ||
582 | } | 582 | } |
583 | 583 | ||
584 | /* | 584 | /* |