ChangeSet 1.1982.115.19, 2005/03/03 23:15:03+01:00, [EMAIL PROTECTED]
[NETFILTER]: Use correct types in seq_printf calls
Signed-off-by: Patrick McHardy <[EMAIL PROTECTED]>
ip_conntrack_standalone.c | 11 ++++++-----
ipt_hashlimit.c | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
diff -Nru a/net/ipv4/netfilter/ip_conntrack_standalone.c
b/net/ipv4/netfilter/ip_conntrack_standalone.c
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-03-12 20:47:45
-08:00
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-03-12 20:47:45
-08:00
@@ -115,11 +115,12 @@
.tuple.dst.protonum);
IP_NF_ASSERT(proto);
- if (seq_printf(s, "%-8s %u %lu ",
+ if (seq_printf(s, "%-8s %u %ld ",
proto->name,
conntrack->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum,
timer_pending(&conntrack->timeout)
- ? (conntrack->timeout.expires - jiffies)/HZ : 0) != 0)
+ ? (long)(conntrack->timeout.expires - jiffies)/HZ
+ : 0) != 0)
return 1;
if (proto->print_conntrack(s, conntrack))
@@ -148,7 +149,7 @@
return 1;
#if defined(CONFIG_IP_NF_CONNTRACK_MARK)
- if (seq_printf(s, "mark=%ld ", conntrack->mark))
+ if (seq_printf(s, "mark=%lu ", conntrack->mark))
return 1;
#endif
@@ -235,8 +236,8 @@
struct ip_conntrack_expect *expect = v;
if (expect->timeout.function)
- seq_printf(s, "%lu ", timer_pending(&expect->timeout)
- ? (expect->timeout.expires - jiffies)/HZ : 0);
+ seq_printf(s, "%ld ", timer_pending(&expect->timeout)
+ ? (long)(expect->timeout.expires - jiffies)/HZ : 0);
else
seq_printf(s, "- ");
diff -Nru a/net/ipv4/netfilter/ipt_hashlimit.c
b/net/ipv4/netfilter/ipt_hashlimit.c
--- a/net/ipv4/netfilter/ipt_hashlimit.c 2005-03-12 20:47:45 -08:00
+++ b/net/ipv4/netfilter/ipt_hashlimit.c 2005-03-12 20:47:45 -08:00
@@ -619,7 +619,7 @@
rateinfo_recalc(ent, jiffies);
return seq_printf(s, "%ld %u.%u.%u.%u:%u->%u.%u.%u.%u:%u %u %u %u\n",
- (ent->expires - jiffies)/HZ,
+ (long)(ent->expires - jiffies)/HZ,
NIPQUAD(ent->dst.src_ip), ntohs(ent->dst.src_port),
NIPQUAD(ent->dst.dst_ip), ntohs(ent->dst.dst_port),
ent->rateinfo.credit, ent->rateinfo.credit_cap,
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
