Make camel_imapx_stream_number() return a guint64

Some fields like UIDVALIDITY and MODSEQ may well be larger than can fit in
a 32-bit value. RFC4551 makes this abundantly clear in its examples.

diff --git a/camel/providers/imapx/camel-imapx-stream.c b/camel/providers/imapx/camel-imapx-stream.c
index 5451469..0874d44 100644 (file)
--- a/camel/providers/imapx/camel-imapx-stream.c
+++ b/camel/providers/imapx/camel-imapx-stream.c
@@ -403,7 +403,7 @@ camel_imapx_stream_nstring_stream(CamelIMAPXStream *is, CamelStream **stream, Ca
        return ret;
 }
 
-guint32
+guint64
 camel_imapx_stream_number(CamelIMAPXStream *is, CamelException *ex)
 {
        guchar *token;
@@ -414,7 +414,7 @@ camel_imapx_stream_number(CamelIMAPXStream *is, CamelException *ex)
                return 0;
        }
 
-       return strtoul((gchar *)token, 0, 10);
+       return strtoull((gchar *)token, 0, 10);
 }
 
 gint

diff --git a/camel/providers/imapx/camel-imapx-stream.h b/camel/providers/imapx/camel-imapx-stream.h
index 433a01f..e7e71c6 100644 (file)
--- a/camel/providers/imapx/camel-imapx-stream.h
+++ b/camel/providers/imapx/camel-imapx-stream.h
@@ -127,7 +127,7 @@ gint                camel_imapx_stream_text         (CamelIMAPXStream *is,
                                                 CamelException *ex);
 
 /* gets a 'number' */
-guint32                 camel_imapx_stream_number      (CamelIMAPXStream *is,
+guint64                 camel_imapx_stream_number      (CamelIMAPXStream *is,
                                                 CamelException *ex);
 
 /* skips the rest of a line, including literals, etc */