From bb6a21a4fcaf400ca4766eea6064f2df30393d1e Mon Sep 17 00:00:00 2001
From: "osdl.net!shemminger" <osdl.net!shemminger>
Date: Wed, 6 Oct 2004 23:17:10 +0000
Subject: [PATCH] Fix build warnings on x86_64

(Logical change 1.92)
---
 misc/ifstat.c |  4 ++--
 tc/m_action.c |  3 ++-
 tc/q_cbq.c    |  3 ++-
 tc/tc.c       | 12 ++++++++----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/misc/ifstat.c b/misc/ifstat.c
index 54afce4..b6f1b87 100644
--- a/misc/ifstat.c
+++ b/misc/ifstat.c
@@ -240,8 +240,8 @@ void dump_raw_db(FILE *fp, int to_hist)
 
 /* use communication definitions of meg/kilo etc */
 static const unsigned long long giga = 1000000000ull;
-static const unsigned long mega = 1000000;
-static const unsigned long kilo = 1000;
+static const unsigned long long mega = 1000000;
+static const unsigned long long kilo = 1000;
 
 void format_rate(FILE *fp, unsigned long long *vals, double *rates, int i)
 {
diff --git a/tc/m_action.c b/tc/m_action.c
index 6d73063..f6edc0d 100644
--- a/tc/m_action.c
+++ b/tc/m_action.c
@@ -45,7 +45,8 @@ void act_usage(void)
 static int print_noaopt(struct action_util *au, FILE *f, struct rtattr *opt)
 {
 	if (opt && RTA_PAYLOAD(opt))
-		fprintf(f, "[Unknown action, optlen=%u] ", RTA_PAYLOAD(opt));
+		fprintf(f, "[Unknown action, optlen=%u] ", 
+			(unsigned) RTA_PAYLOAD(opt));
 	return 0;
 }
 
diff --git a/tc/q_cbq.c b/tc/q_cbq.c
index b3973d3..82a69ee 100644
--- a/tc/q_cbq.c
+++ b/tc/q_cbq.c
@@ -452,7 +452,8 @@ static int cbq_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
 	if (tb[TCA_CBQ_OVL_STRATEGY]) {
 		if (RTA_PAYLOAD(tb[TCA_CBQ_OVL_STRATEGY]) < sizeof(*ovl))
 			fprintf(stderr, "CBQ: too short overlimit strategy %u/%u\n",
-				RTA_PAYLOAD(tb[TCA_CBQ_OVL_STRATEGY]), sizeof(*ovl));
+				(unsigned) RTA_PAYLOAD(tb[TCA_CBQ_OVL_STRATEGY]), 
+				(unsigned) sizeof(*ovl));
 		else
 			ovl = RTA_DATA(tb[TCA_CBQ_OVL_STRATEGY]);
 	}
diff --git a/tc/tc.c b/tc/tc.c
index 0e2df40..3a76caa 100644
--- a/tc/tc.c
+++ b/tc/tc.c
@@ -44,7 +44,8 @@ static int print_noqopt(struct qdisc_util *qu, FILE *f,
 			struct rtattr *opt)
 {
 	if (opt && RTA_PAYLOAD(opt))
-		fprintf(f, "[Unknown qdisc, optlen=%u] ", RTA_PAYLOAD(opt));
+		fprintf(f, "[Unknown qdisc, optlen=%u] ", 
+			(unsigned) RTA_PAYLOAD(opt));
 	return 0;
 }
 
@@ -60,7 +61,8 @@ static int parse_noqopt(struct qdisc_util *qu, int argc, char **argv, struct nlm
 static int print_nofopt(struct filter_util *qu, FILE *f, struct rtattr *opt, __u32 fhandle)
 {
 	if (opt && RTA_PAYLOAD(opt))
-		fprintf(f, "fh %08x [Unknown filter, optlen=%u] ", fhandle, RTA_PAYLOAD(opt));
+		fprintf(f, "fh %08x [Unknown filter, optlen=%u] ", 
+			fhandle, (unsigned) RTA_PAYLOAD(opt));
 	else if (fhandle)
 		fprintf(f, "fh %08x ", fhandle);
 	return 0;
@@ -226,14 +228,16 @@ int main(int argc, char **argv)
 			if (line[strlen(line)-1]=='\n') {
 				line[strlen(line)-1] = '\0';
 			} else {
-				fprintf(stderr, "No newline at the end of line, looks like to long (%d chars or more)\n", strlen(line));
+				fprintf(stderr, "No newline at the end of line, looks like to long (%d chars or more)\n", 
+					(int) strlen(line));
 				exit(-1);
 			}
 			largc = 0;
 			largv[largc]=strtok(line, " ");
 			while ((largv[++largc]=strtok(NULL, " ")) != NULL) {
 				if (largc > BMAXARG) {
-					fprintf(stderr, "Over %d arguments in batch mode, enough!\n", BMAXARG);
+					fprintf(stderr, "Over %d arguments in batch mode, enough!\n", 
+						(int) BMAXARG);
 					exit(-1);
 				}
 			}
-- 
2.39.2