matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix build warnings on x86_64 

(Logical change 1.92)
This commit is contained in:
osdl.net!shemminger 2004-10-06 23:17:10 +00:00
parent d163858f72
commit bb6a21a4fc
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/ifstat.c
View File

@ -240,8 +240,8 @@ void dump_raw_db(FILE *fp, int to_hist)
/* use communication definitions of meg/kilo etc */ /* use communication definitions of meg/kilo etc */
static const unsigned long long giga = 1000000000ull; static const unsigned long long giga = 1000000000ull;
static const unsigned long mega = 1000000; static const unsigned long long mega = 1000000;
static const unsigned long kilo = 1000; static const unsigned long long kilo = 1000;
void format_rate(FILE *fp, unsigned long long *vals, double *rates, int i) void format_rate(FILE *fp, unsigned long long *vals, double *rates, int i)
{ {

3
tc/m_action.c
View File

@ -45,7 +45,8 @@ void act_usage(void)
static int print_noaopt(struct action_util *au, FILE *f, struct rtattr *opt) static int print_noaopt(struct action_util *au, FILE *f, struct rtattr *opt)
{ {
if (opt && RTA_PAYLOAD(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; return 0;
} }

3
tc/q_cbq.c
View File

@ -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 (tb[TCA_CBQ_OVL_STRATEGY]) {
if (RTA_PAYLOAD(tb[TCA_CBQ_OVL_STRATEGY]) < sizeof(*ovl)) if (RTA_PAYLOAD(tb[TCA_CBQ_OVL_STRATEGY]) < sizeof(*ovl))
fprintf(stderr, "CBQ: too short overlimit strategy %u/%u\n", 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 else
ovl = RTA_DATA(tb[TCA_CBQ_OVL_STRATEGY]); ovl = RTA_DATA(tb[TCA_CBQ_OVL_STRATEGY]);
} }

12
tc/tc.c
View File

@ -44,7 +44,8 @@ static int print_noqopt(struct qdisc_util *qu, FILE *f,
struct rtattr *opt) struct rtattr *opt)
{ {
if (opt && RTA_PAYLOAD(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; 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) static int print_nofopt(struct filter_util *qu, FILE *f, struct rtattr *opt, __u32 fhandle)
{ {
if (opt && RTA_PAYLOAD(opt)) 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) else if (fhandle)
fprintf(f, "fh %08x ", fhandle); fprintf(f, "fh %08x ", fhandle);
return 0; return 0;
@ -226,14 +228,16 @@ int main(int argc, char **argv)
if (line[strlen(line)-1]=='\n') { if (line[strlen(line)-1]=='\n') {
line[strlen(line)-1] = '\0'; line[strlen(line)-1] = '\0';
} else { } 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); exit(-1);
} }
largc = 0; largc = 0;
largv[largc]=strtok(line, " "); largv[largc]=strtok(line, " ");
while ((largv[++largc]=strtok(NULL, " ")) != NULL) { while ((largv[++largc]=strtok(NULL, " ")) != NULL) {
if (largc > BMAXARG) { 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); exit(-1);
} }
} }