From e58168e6ae77410fe5dae4c1f5566b43edc8d47a Mon Sep 17 00:00:00 2001
From: Brenden Matthews <brenden1@rty.ca>
Date: Tue, 18 Oct 2005 00:54:51 +0000
Subject: [PATCH] fix for bug 1328444?

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@353 7f574dfc-610e-0410-a909-a81674777703
---
 src/conky.c |  8 ++++----
 src/conky.h |  4 ++--
 src/linux.c | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/conky.c b/src/conky.c
index f82550e4..90c0a48f 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -2504,12 +2504,12 @@ static void generate_text()
 			OBJ(memperc) {
 				if (cur->memmax) {
 					if (!use_spacer)
-						snprintf(p, n, "%*d",
+						snprintf(p, n, "%*lu",
 							 pad_percents,
 							 (cur->mem * 100) /
 							 (cur->memmax));
 					else
-						snprintf(p, 4, "%*d   ",
+						snprintf(p, 4, "%*lu   ",
 							 pad_percents,
 							 (cur->mem * 100) /
 							 (cur->memmax));
@@ -2658,13 +2658,13 @@ static void generate_text()
 					strncpy(p, "No swap", 255);
 				} else {
 					if (!use_spacer)
-						snprintf(p, 255, "%*u",
+						snprintf(p, 255, "%*lu",
 							 pad_percents,
 							 (cur->swap *
 							  100) /
 							 cur->swapmax);
 					else
-						snprintf(p, 4, "%*u   ",
+						snprintf(p, 4, "%*lu   ",
 							 pad_percents,
 							 (cur->swap *
 							  100) /
diff --git a/src/conky.h b/src/conky.h
index f2e81e0a..fa95ba42 100644
--- a/src/conky.h
+++ b/src/conky.h
@@ -159,8 +159,8 @@ struct information {
 	double uptime;
 
 	/* memory information in kilobytes */
-	unsigned int mem, memmax, swap, swapmax;
-	unsigned int bufmem, buffers, cached;
+	unsigned long mem, memmax, swap, swapmax;
+	unsigned long bufmem, buffers, cached;
 
 	unsigned int procs;
 	unsigned int run_procs;
diff --git a/src/linux.c b/src/linux.c
index 87b09c9f..2612d6ff 100644
--- a/src/linux.c
+++ b/src/linux.c
@@ -109,17 +109,17 @@ void update_meminfo()
 			break;
 
 		if (strncmp(buf, "MemTotal:", 9) == 0) {
-			sscanf(buf, "%*s %u", &info.memmax);
+			sscanf(buf, "%*s %lu", &info.memmax);
 		} else if (strncmp(buf, "MemFree:", 8) == 0) {
-			sscanf(buf, "%*s %u", &info.mem);
+			sscanf(buf, "%*s %lu", &info.mem);
 		} else if (strncmp(buf, "SwapTotal:", 10) == 0) {
-			sscanf(buf, "%*s %u", &info.swapmax);
+			sscanf(buf, "%*s %lu", &info.swapmax);
 		} else if (strncmp(buf, "SwapFree:", 9) == 0) {
-			sscanf(buf, "%*s %u", &info.swap);
+			sscanf(buf, "%*s %lu", &info.swap);
 		} else if (strncmp(buf, "Buffers:", 8) == 0) {
-			sscanf(buf, "%*s %u", &info.buffers);
+			sscanf(buf, "%*s %lu", &info.buffers);
 		} else if (strncmp(buf, "Cached:", 7) == 0) {
-			sscanf(buf, "%*s %u", &info.cached);
+			sscanf(buf, "%*s %lu", &info.cached);
 		}
 	}