Update to int types to ULL for disk block sizes

This is a multi-part message in MIME format.

--nextPart9163484.S0dRB3ooBr
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"

Peter Hyman (2):
      fix disk block sizes int type to ULL
      fixup for monitor.c for ULL

 server/monitor.c      |  4 ++--
 src/client.c          |  4 ++--
 src/fs.c              | 12 ++++++------
 src/gkrellm-sysdeps.h |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

For review.

-- 
Peter Hyman
--nextPart9163484.S0dRB3ooBr
Content-Disposition: attachment; filename="gkrellm-ull.patch"
Content-Transfer-Encoding: 7Bit
Content-Type: text/x-patch; charset="ISO-8859-1"; name="gkrellm-ull.patch"

diff --git a/server/monitor.c b/server/monitor.c
index 1a7fa45..f700347 100644
--- a/server/monitor.c
+++ b/server/monitor.c
@@ -1309,7 +1309,7 @@ typedef struct
 				*device,
 				*type,
 				*options;
-	gint64		blocks,
+	guint64		blocks,
 				bavail,
 				bfree,
 				bsize;
@@ -1392,7 +1392,7 @@ gkrellm_fs_add_to_fstab_list(gchar *dir, gchar *dev, gchar *type, gchar *opt)
 
 void
 gkrellm_fs_assign_fsusage_data(gpointer pointer,
-		gint64 blocks, gint64 bavail, gint64 bfree, gint64 bsize)
+		guint64 blocks, guint64 bavail, guint64 bfree, guint64 bsize)
 	{
 	Mount	*m = (Mount *) pointer;
 
diff --git a/src/client.c b/src/client.c
index 8f9d5f8..0667b62 100644
--- a/src/client.c
+++ b/src/client.c
@@ -751,7 +751,7 @@ typedef struct
 	gchar	*directory,
 			*device,
 			*type;
-	gint64	blocks,
+	guint64	blocks,
 			bavail,
 			bfree,
 			bsize;
@@ -836,7 +836,7 @@ client_fs_line_from_server(gchar *line)
 	GList	*list;
 	Mount	*m;
 	gchar	dir[128], dev[64];
-	gulong	blocks, bavail, bfree, bsize;
+	guint64	blocks, bavail, bfree, bsize;
 
 	sscanf(line, "%127s %63s %lu %lu %lu %lu", dir, dev,
 				&blocks, &bavail, &bfree, &bsize);
diff --git a/src/fs.c b/src/fs.c
index 5db65b1..8682339 100644
--- a/src/fs.c
+++ b/src/fs.c
@@ -96,7 +96,7 @@ typedef struct
 	gulong		krell_factor;		/* avoid krell math overflow */
 
 	gboolean	busy;
-	gint64		blocks,
+	guint64		blocks,
 				bfree,
 				bavail,
 				bsize;
@@ -236,7 +236,7 @@ gkrellm_fs_add_to_fstab_list(gchar *dir, gchar *dev, gchar *type, gchar *opt)
 
 void
 gkrellm_fs_assign_fsusage_data(gpointer fspointer,
-			gint64 blocks, gint64 bavail, gint64 bfree, gint64 bsize)
+			guint64 blocks, guint64 bavail, guint64 bfree, guint64 bsize)
 	{
 	FSmon	*fs = (FSmon *) fspointer;
 
@@ -358,7 +358,7 @@ static GkrellmSizeAbbrev	fs_binary_abbrev[] =
 static gint
 format_fs_data(FSmon *fs, gchar *src_string, gchar *buf, gint size)
 	{
-	gint64		b, u, a;
+	guint64		b, u, a;
 	gint		len;
 	gchar		*s;
 	gchar		tbuf[32], ubuf[32], abuf[32];
@@ -724,7 +724,7 @@ fs_update(void)
 	GkrellmPanel	*p;
 	GkrellmKrell	*k;
 	GList			*list;
-	gint64			used, avail;
+	guint64			used, avail;
 	gint			full_scale, index, w_scroll, w;
 	gboolean		fs_check, nfs_check, force_check, force_draw,
 					mounting_enabled;
@@ -807,9 +807,9 @@ fs_update(void)
 					gth = g_thread_new("get_fsusage", get_fsusage_thread, fs);
 					g_thread_unref(gth);
 					}
-				if (fs->blocks > 2147483648LL)
+				if (fs->blocks > 2147483648ULL)
 					fs->krell_factor = 1024 * 1024;
-				else if (fs->blocks > 2097152LL)
+				else if (fs->blocks > 2097152ULL)
 					fs->krell_factor = 1024;
 				else
 					fs->krell_factor = 1;
diff --git a/src/gkrellm-sysdeps.h b/src/gkrellm-sysdeps.h
index 07295fb..ce113cc 100644
--- a/src/gkrellm-sysdeps.h
+++ b/src/gkrellm-sysdeps.h
@@ -257,7 +257,7 @@ void	gkrellm_fs_client_divert(void (*get_fsusage_func)(),
 				void (*get_mounts_func)(), void (*get_fstab_func)(),
 				gboolean (*fstab_modified_func)());
 void	gkrellm_fs_assign_fsusage_data(gpointer fs,
-				gint64 blocks, gint64 avail, gint64 free, gint64 bsize);
+				guint64 blocks, guint64 avail, guint64 free, guint64 bsize);
 void	gkrellm_fs_add_to_fstab_list(gchar *dir, gchar *dev, gchar *type,
 				gchar *options);
 void	gkrellm_fs_add_to_mounts_list(gchar *dir, gchar *dev, gchar *type);

--nextPart9163484.S0dRB3ooBr--