diff options
author | Thomas Martitz <kugel@rockbox.org> | 2014-02-03 12:33:33 +0100 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2014-02-03 12:33:33 +0100 |
commit | 10b3bc78f6e55a3a442f2da1f95f158ab158e648 (patch) | |
tree | c14723a5b73dd576db3e1620ba1e3f75dc610626 /apps | |
parent | e5eb74592eeff013d818ff0c56692b220dd53fbc (diff) | |
download | rockbox-10b3bc78f6e55a3a442f2da1f95f158ab158e648.tar.gz rockbox-10b3bc78f6e55a3a442f2da1f95f158ab158e648.zip |
Fix warnings.
Change-Id: If3cbcd7557797684f1b7fea8e1bb134777680dee
Diffstat (limited to 'apps')
-rw-r--r-- | apps/talk.c | 2 | ||||
-rw-r--r-- | apps/voice_thread.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/talk.c b/apps/talk.c index ab9ca8c495..13f323f4b6 100644 --- a/apps/talk.c +++ b/apps/talk.c | |||
@@ -312,6 +312,7 @@ static int id2index(int id) | |||
312 | return index; | 312 | return index; |
313 | } | 313 | } |
314 | 314 | ||
315 | #ifndef TALK_PROGRESSIVE_LOAD | ||
315 | static int index2id(int index) | 316 | static int index2id(int index) |
316 | { | 317 | { |
317 | int id = index; | 318 | int id = index; |
@@ -329,6 +330,7 @@ static int index2id(int index) | |||
329 | 330 | ||
330 | return id; | 331 | return id; |
331 | } | 332 | } |
333 | #endif | ||
332 | 334 | ||
333 | static int free_oldest_clip(void) | 335 | static int free_oldest_clip(void) |
334 | { | 336 | { |
diff --git a/apps/voice_thread.c b/apps/voice_thread.c index dcb7eef224..d8a7b27d14 100644 --- a/apps/voice_thread.c +++ b/apps/voice_thread.c | |||
@@ -458,7 +458,7 @@ static enum voice_state voice_decode(struct voice_thread_data *td) | |||
458 | else | 458 | else |
459 | { | 459 | { |
460 | if (td->vi.size > VOICE_MAX_ENCODED_FRAME_SIZE | 460 | if (td->vi.size > VOICE_MAX_ENCODED_FRAME_SIZE |
461 | && td->bits.charPtr > (td->vi.size - VOICE_MAX_ENCODED_FRAME_SIZE) | 461 | && td->bits.charPtr > (int)(td->vi.size - VOICE_MAX_ENCODED_FRAME_SIZE) |
462 | && td->vi.get_more != NULL) | 462 | && td->vi.get_more != NULL) |
463 | { | 463 | { |
464 | /* request more data _before_ running out of data (requesting | 464 | /* request more data _before_ running out of data (requesting |