summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2011-08-14 15:43:43 +0000
committerThomas Martitz <kugel@rockbox.org>2011-08-14 15:43:43 +0000
commitb8fabfef8455166361144428a10e3a5d6bf5466b (patch)
tree89695362c0dc201fe20c3d1b15cc5195f1240758
parent8a701e5488989944f120f0c37848de24fbeff455 (diff)
downloadrockbox-b8fabfef8455166361144428a10e3a5d6bf5466b.zip
rockbox-b8fabfef8455166361144428a10e3a5d6bf5466b.tar.gz
rockbox-b8fabfef8455166361144428a10e3a5d6bf5466b.tar.bz2
rockbox-b8fabfef8455166361144428a10e3a5d6bf5466b.tar.xz
Fix remaining problems.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30311 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/mpeg.c1
-rw-r--r--apps/talk.c6
2 files changed, 3 insertions, 4 deletions
diff --git a/apps/mpeg.c b/apps/mpeg.c
index 5e2816f..6dd55b7 100644
--- a/apps/mpeg.c
+++ b/apps/mpeg.c
@@ -2650,7 +2650,6 @@ void audio_set_recording_gain(int left, int right, int type)
void audio_init_recording(void)
{
/* a dummy */
- (void)buffer_offset;
}
void audio_set_recording_options(struct audio_recording_options *options)
{
diff --git a/apps/talk.c b/apps/talk.c
index 0211bcc..f32e1b6 100644
--- a/apps/talk.c
+++ b/apps/talk.c
@@ -292,7 +292,7 @@ static void load_voicefile(bool probe, char* buf, size_t bufsize)
union voicebuf voicebuf;
size_t load_size, alloc_size;
- int got_size;
+ ssize_t got_size;
#ifndef TALK_PARTIAL_LOAD
size_t file_size;
#endif
@@ -328,7 +328,7 @@ static void load_voicefile(bool probe, char* buf, size_t bufsize)
#endif
got_size = read(filehandle, voicebuf.buf, load_size);
- if (got_size != load_size /* failure */)
+ if (got_size != (ssize_t)load_size /* failure */)
goto load_err;
alloc_size = load_size;
@@ -370,7 +370,7 @@ static void load_voicefile(bool probe, char* buf, size_t bufsize)
#endif
got_size = read(filehandle, &p_voicefile->index[0], load_size);
- if (got_size != load_size) /* read error */
+ if (got_size != (ssize_t)load_size) /* read error */
goto load_err;
alloc_size += load_size;