summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2011-05-24 10:56:01 +0000
committerNils Wallménius <nils@rockbox.org>2011-05-24 10:56:01 +0000
commit2e3162f039fdb4d48aa5c9a1bf6c11ac9439a514 (patch)
tree07f365817f9c0fa220b84d0802bb971f40700831
parent5fd9471c156ca054fbe5fc5d2b002f94645f473c (diff)
downloadrockbox-2e3162f039fdb4d48aa5c9a1bf6c11ac9439a514.tar.gz
rockbox-2e3162f039fdb4d48aa5c9a1bf6c11ac9439a514.tar.bz2
rockbox-2e3162f039fdb4d48aa5c9a1bf6c11ac9439a514.zip
Fix 2 'set but not used' warnings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29922 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/bookmark.c7
-rw-r--r--apps/radio/radio.c6
2 files changed, 7 insertions, 6 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c
index 28aecb4c23..434ac2aa95 100644
--- a/apps/bookmark.c
+++ b/apps/bookmark.c
@@ -857,8 +857,6 @@ static bool delete_bookmark(const char* bookmark_file_name, int bookmark_id)
static void say_bookmark(const char* bookmark,
int bookmark_id, bool show_playlist_name)
{
- bool is_dir;
-
if (!parse_bookmark(bookmark, true))
{
talk_id(LANG_BOOKMARK_INVALID, false);
@@ -867,9 +865,10 @@ static void say_bookmark(const char* bookmark,
talk_number(bookmark_id + 1, false);
- is_dir = (global_temp_buffer[0]
- && global_temp_buffer[strlen(global_temp_buffer)-1] == '/');
#if CONFIG_CODEC == SWCODEC
+ bool is_dir = (global_temp_buffer[0]
+ && global_temp_buffer[strlen(global_temp_buffer)-1] == '/');
+
/* HWCODEC cannot enqueue voice file entries and .talk thumbnails
together, because there is no guarantee that the same mp3
parameters are used. */
diff --git a/apps/radio/radio.c b/apps/radio/radio.c
index d1a94ac295..5c0b884cd1 100644
--- a/apps/radio/radio.c
+++ b/apps/radio/radio.c
@@ -392,8 +392,8 @@ void radio_screen(void)
#endif
#if CONFIG_CODEC != SWCODEC
int timeout = current_tick + HZ/10;
- unsigned int last_seconds = 0;
#if !defined(SIMULATOR)
+ unsigned int last_seconds = 0;
unsigned int seconds = 0;
struct audio_recording_options rec_options;
#endif /* SIMULATOR */
@@ -547,8 +547,10 @@ void radio_screen(void)
rec_command(RECORDING_CMD_START);
update_type = SKIN_REFRESH_ALL;
}
-#endif /* SIMULATOR */
+#if CONFIG_CODEC != SWCODEC
last_seconds = 0;
+#endif
+#endif /* SIMULATOR */
break;
#endif /* #ifdef FM_RECORD */