[gmime] various compiler warning fixes
- From: Jeffrey Stedfast <fejj src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gmime] various compiler warning fixes
- Date: Thu, 1 Oct 2009 00:28:52 +0000 (UTC)
commit ed80e70eff4755d3d68aa863a8e84e7caa40d9b3
Author: Jeffrey Stedfast <fejj gnome org>
Date: Wed Sep 30 20:29:37 2009 -0400
various compiler warning fixes
ChangeLog | 5 ++++-
gmime/gmime-stream-gio.c | 8 +++-----
2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a77dd81..6e75539 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,10 @@
* build/vs2008/*: Made the Project/Solution tree much nicer.
- * gmime/gmime-stream-gio.c (set_errno): Fixes to build on Windows.
+ * gmime/gmime-stream-gio.c: various warning fixes.
+ (set_errno): Fixes to build on Windows.
+ (gio_seekable_bound_end): This needs to return gint64, not
+ ssize_t.
* tests/test-streams.c: Use GDir instead of POSIX's dirent API and
also conditionally disable mmap tests.
diff --git a/gmime/gmime-stream-gio.c b/gmime/gmime-stream-gio.c
index 5da17c3..b476beb 100644
--- a/gmime/gmime-stream-gio.c
+++ b/gmime/gmime-stream-gio.c
@@ -206,7 +206,7 @@ stream_read (GMimeStream *stream, char *buf, size_t len)
}
if (stream->bound_end != -1)
- len = MIN (stream->bound_end - stream->position, (gint64) len);
+ len = (size_t) MIN (stream->bound_end - stream->position, (gint64) len);
/* make sure we are at the right position */
if (G_IS_SEEKABLE (gio->istream)) {
@@ -237,7 +237,6 @@ stream_write (GMimeStream *stream, const char *buf, size_t len)
GMimeStreamGIO *gio = (GMimeStreamGIO *) stream;
size_t nwritten = 0;
GError *err = NULL;
- ssize_t n;
if (gio->file == NULL) {
errno = EBADF;
@@ -258,7 +257,7 @@ stream_write (GMimeStream *stream, const char *buf, size_t len)
}
if (stream->bound_end != -1)
- len = MIN (stream->bound_end - stream->position, (gint64) len);
+ len = (size_t) MIN (stream->bound_end - stream->position, (gint64) len);
/* make sure we are at the right position */
if (G_IS_SEEKABLE (gio->ostream)) {
@@ -460,7 +459,6 @@ static gint64
stream_seek (GMimeStream *stream, gint64 offset, GMimeSeekWhence whence)
{
GMimeStreamGIO *gio = (GMimeStreamGIO *) stream;
- GSeekable *seekable;
GError *err = NULL;
gint64 real;
@@ -555,7 +553,7 @@ stream_tell (GMimeStream *stream)
return stream->position;
}
-static ssize_t
+static gint64
gio_seekable_bound_end (GMimeStream *stream, GSeekable *seekable)
{
GError *err = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]