summaryrefslogtreecommitdiff
path: root/apps/settings.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-10-20 21:54:44 +0000
committerThomas Martitz <kugel@rockbox.org>2009-10-20 21:54:44 +0000
commit774bacc692b4d5c7b769bb88d24e182db9e4656f (patch)
tree07c5ed05c9d46145c783bd1de5062731e6babb32 /apps/settings.c
parent872852639fc52bcdb2cc8199fed60f81c7cad1f9 (diff)
downloadrockbox-774bacc692b4d5c7b769bb88d24e182db9e4656f.zip
rockbox-774bacc692b4d5c7b769bb88d24e182db9e4656f.tar.gz
rockbox-774bacc692b4d5c7b769bb88d24e182db9e4656f.tar.bz2
rockbox-774bacc692b4d5c7b769bb88d24e182db9e4656f.tar.xz
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.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/settings.c b/apps/settings.c
index 7a36a0e..f12bd92 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -568,17 +568,17 @@ static bool settings_write_config(const char* filename, int options)
return true;
}
#ifndef HAVE_RTC_RAM
-static bool flush_global_status_callback(void)
+static void flush_global_status_callback(void *data)
{
- return write_nvram_data(nvram_buffer,NVRAM_BLOCK_SIZE);
+ (void)data;
+ write_nvram_data(nvram_buffer,NVRAM_BLOCK_SIZE);
}
#endif
-static bool flush_config_block_callback(void)
+static void flush_config_block_callback(void *data)
{
- bool r1, r2;
- r1 = write_nvram_data(nvram_buffer,NVRAM_BLOCK_SIZE);
- r2 = settings_write_config(CONFIGFILE, SETTINGS_SAVE_CHANGED);
- return r1 || r2;
+ (void)data;
+ write_nvram_data(nvram_buffer,NVRAM_BLOCK_SIZE);
+ settings_write_config(CONFIGFILE, SETTINGS_SAVE_CHANGED);
}
/*