2008-03-18 [colin] 3.3.1cvs31

	* src/common/utils.c
	* src/common/utils.h
		Handle size_t instead of off_t in to_human_readable

diff --git a/ChangeLog b/ChangeLog
index 1ebd789ec39ad64250619e3520f5d7430bdd04c3..f2777dca23b8760aa04e48c538ddf3a2244c76a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-18 [colin]     3.3.1cvs31
+
+       * src/common/utils.c
+       * src/common/utils.h
+               Handle size_t instead of off_t in to_human_readable
+
 2008-03-18 [colin]     3.3.1cvs30
 
        * src/imap.c

diff --git a/PATCHSETS b/PATCHSETS
index 4b964395647a5572da9b86d0423d632b1460e32d..80a684303d062395e68f3868b3aa4b0767ad3523 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3265,3 +3265,4 @@
 ( cvs diff -u -r 1.274.2.237 -r 1.274.2.238 src/mainwindow.c;  ) > 3.3.1cvs28.patchset
 ( cvs diff -u -r 1.395.2.362 -r 1.395.2.363 src/summaryview.c;  ) > 3.3.1cvs29.patchset
 ( cvs diff -u -r 1.179.2.213 -r 1.179.2.214 src/imap.c;  ) > 3.3.1cvs30.patchset
+( cvs diff -u -r 1.36.2.135 -r 1.36.2.136 src/common/utils.c;  cvs diff -u -r 1.20.2.59 -r 1.20.2.60 src/common/utils.h;  ) > 3.3.1cvs31.patchset

diff --git a/configure.ac b/configure.ac
index 42341b505e781b2186b339cad75f673c734f5390..f084292d2c980035c64e97b86883959ae15e0d8f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=30
+EXTRA_VERSION=31
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/utils.c b/src/common/utils.c
index 57d9de87b5e62463329ecffbec75ffd908ca39cf..8bd3d60b9f31ac6ca6dd7ebffe951fcc3e11724c 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -322,7 +322,7 @@ gchar *itos(gint n)
        d = (d*100) >> divisor;         \
 }
 
-gchar *to_human_readable(off_t size)
+gchar *to_human_readable(size_t size)
 {
        static gchar str[14];
        static gchar *b_format = NULL, *kb_format = NULL, 
@@ -334,20 +334,20 @@ gchar *to_human_readable(off_t size)
                mb_format = _("%d.%02dMB");
                gb_format = _("%.2fGB");
        }
-       
-       if (size < (off_t)1024) {
+
+       if (size < (size_t)1024) {
                g_snprintf(str, sizeof(str), b_format, (gint)size);
                return str;
-       } else if (size >> 10 < (off_t)1024) {
+       } else if (size >> 10 < (size_t)1024) {
                divide(size, 10, t, r);
                g_snprintf(str, sizeof(str), kb_format, t, r);
                return str;
-       } else if (size >> 20 < (off_t)1024) {
+       } else if (size >> 20 < (size_t)1024) {
                divide(size, 20, t, r);
                g_snprintf(str, sizeof(str), mb_format, t, r);
                return str;
        } else {
-               g_snprintf(str, sizeof(str), gb_format, (gfloat)size / (1 << 30));
+               g_snprintf(str, sizeof(str), gb_format, (gfloat)(size) / (1 << 30));
                return str;
        }
 }

diff --git a/src/common/utils.h b/src/common/utils.h
index 9f587decc6dc38070ec49301567ecbca6d8bf0ea..12a90bec6723e427ee53d2d09958ab8561bd9248 100644 (file)
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -243,7 +243,7 @@ gint to_number                      (const gchar *nstr);
 gchar *itos_buf                        (gchar       *nstr,
                                 gint         n);
 gchar *itos                    (gint         n);
-gchar *to_human_readable       (off_t        size);
+gchar *to_human_readable       (size_t       size);
 
 /* alternative string functions */
 gint strcmp2           (const gchar    *s1,