[Pkg-wmaker-commits] [wmbubble] 177/207: Fix -Wformat compiler warnings.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmbubble.

commit 044f11ecc5c0c045a19194cde8dbba33624c43ab
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Sat Nov 29 00:44:18 2014 -0600

    Fix -Wformat compiler warnings.
    
    In particular, several like:
    bubblemon.c: In function ‘render_secondary’:
    bubblemon.c:1009:4: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 4 has type ‘u_int64_t’ [-Wformat=]
        snprintf(number, 8, "%6lluM", bm.mem_used >> 20);
        ^
    and
    bubblemon.c: In function ‘make_new_bubblemon_dockapp’:
    bubblemon.c:620:2: warning: format ‘%u’ expects argument of type ‘unsigned int *’, but argument 3 has type ‘int *’ [-Wformat=]
      sscanf(datefont_xpm[0],"%u %u %u %u",&maxwidth,&yy,&datefont_offset,&cc);
      ^
---
 bubblemon.c | 13 +++++++------
 sys_linux.c | 13 ++++++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/bubblemon.c b/bubblemon.c
index ba63111..80682a7 100644
--- a/bubblemon.c
+++ b/bubblemon.c
@@ -57,6 +57,7 @@
 #include <locale.h>
 #include <ctype.h> /* I know tolower isn't i18n, I'm sorry */
 #include <math.h>
+#include <inttypes.h>
 
 /* x11 includes */
 #include "wmx11pixmap.h"
@@ -616,7 +617,7 @@ void make_new_bubblemon_dockapp(void) {
 
 	build_graphs();
 
-	sscanf(datefont_xpm[0],"%u %u %u %u",&maxwidth,&yy,&datefont_offset,&cc);
+	sscanf(datefont_xpm[0],"%d %d %d %d",&maxwidth,&yy,&datefont_offset,&cc);
 	if (cc != 1) abort(); /* fuck that */
 
 	datefont_offset++; /* include header line */
@@ -876,7 +877,7 @@ void draw_from_xpm(char **xpm, unsigned char *whither, unsigned int targetw,
 	char * from;
 	char transparent=0;
 
-	sscanf(xpm[0],"%u %u %u %u",&xx,&yy,&ncolors,&cpp);
+	sscanf(xpm[0],"%d %d %d %d",&xx,&yy,&ncolors,&cpp);
 	if (cpp != 1) abort(); /* fuck that */
 	if (xpmx+xpmw > xx || xpmy+xpmh > yy) return;
 
@@ -1006,18 +1007,18 @@ void render_secondary(void) {
 	} else {
 		/* draw memory */
 		if (memscreen_megabytes || bm.mem_used > (999999<<10))
-			snprintf(number, 8, "%6lluM", bm.mem_used >> 20);
+			snprintf(number, 8, "%6"PRIu64"M", bm.mem_used >> 20);
 		else
-			snprintf(number, 8, "%6lluK", bm.mem_used >> 10);
+			snprintf(number, 8, "%"PRIu64"K", bm.mem_used >> 10);
 		snprintf(percent, 4, "%+3d", bm.mem_percent);
 		draw_string(number, 3, 2, (bm.mem_percent > 90) ? 1 : 0);
 		draw_string(percent, 39, 2, (bm.mem_percent > 90) ? 1 : 0);
 
 		/* draw swap */
 		if (memscreen_megabytes || bm.swap_used > (999999<<10))
-			snprintf(number, 8, "%6lluM", bm.swap_used >> 20);
+			snprintf(number, 8, "%6"PRIu64"M", bm.swap_used >> 20);
 		else
-			snprintf(number, 8, "%6lluK", bm.swap_used >> 10);
+			snprintf(number, 8, "%6"PRIu64"K", bm.swap_used >> 10);
 		snprintf(percent, 4, "%+3d", bm.swap_percent);
 		draw_string(number, 3, 11, (bm.swap_percent > 90) ? 1 : 0);
 		draw_string(percent, 39, 11, (bm.swap_percent > 90) ? 1 : 0);
diff --git a/sys_linux.c b/sys_linux.c
index be23f82..41be9f1 100644
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/utsname.h>
+#include <inttypes.h>
 #include "include/bubblemon.h"
 #include "include/sys_include.h"
 
@@ -34,7 +35,8 @@ int system_cpu(void) {
 	FILE *stat;
 
 	stat = fopen("/proc/stat", "r");
-	fscanf(stat, "%*s %Ld %Ld %Ld %Ld", &ab, &ac, &ad, &ae);
+	fscanf(stat, "%*s %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64,
+	       &ab, &ac, &ad, &ae);
 	fclose(stat);
 
 	/* Find out the CPU load */
@@ -82,22 +84,23 @@ void system_memory(void) {
 	fread(shit, 2048, 1, mem);
 	p = strstr(shit, "MemTotal");
 	if (p) {
-		sscanf(p, "MemTotal:%Ld", &bm.mem_max);
+		sscanf(p, "MemTotal:%"PRIu64, &bm.mem_max);
 		bm.mem_max <<= 10;
 
 		p = strstr(p, "Active");
 		if (p) {
-			sscanf(p, "Active:%Ld", &bm.mem_used);
+			sscanf(p, "Active:%"PRIu64, &bm.mem_used);
 			bm.mem_used <<= 10;
 
 			p = strstr(p, "SwapTotal");
 			if (p) {
-				sscanf(p, "SwapTotal:%Ld", &bm.swap_max);
+				sscanf(p, "SwapTotal:%"PRIu64, &bm.swap_max);
 				bm.swap_max <<= 10;
 
 				p = strstr(p, "SwapFree");
 				if (p) {
-					sscanf(p, "SwapFree:%Ld", &bm.swap_used);
+					sscanf(p, "SwapFree:%"PRIu64,
+					       &bm.swap_used);
 					bm.swap_used = bm.swap_max - (bm.swap_used << 10);
 				}
 			}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbubble.git