Import patch iproute2.116
(Logical change 1.118)
diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c
index 4df3fb9..b29b3a0 100644
--- a/ip/ipxfrm.c
+++ b/ip/ipxfrm.c
@@ -243,7 +243,7 @@
if (limit == XFRM_INF)
strcpy(str, "(INF)");
else
- sprintf(str, "%llu", limit);
+ sprintf(str, "%llu", (unsigned long long) limit);
return str;
}
@@ -323,9 +323,9 @@
fprintf(fp, " ");
fprintf(fp, "expire add: ");
fprintf(fp, "soft ");
- fprintf(fp, "%llu", cfg->soft_add_expires_seconds);
+ fprintf(fp, "%llu", (unsigned long long) cfg->soft_add_expires_seconds);
fprintf(fp, "(sec), hard ");
- fprintf(fp, "%llu", cfg->hard_add_expires_seconds);
+ fprintf(fp, "%llu", (unsigned long long) cfg->hard_add_expires_seconds);
fprintf(fp, "(sec)");
fprintf(fp, "%s", _SL_);
@@ -334,9 +334,9 @@
fprintf(fp, " ");
fprintf(fp, "expire use: ");
fprintf(fp, "soft ");
- fprintf(fp, "%llu", cfg->soft_use_expires_seconds);
+ fprintf(fp, "%llu", (unsigned long long) cfg->soft_use_expires_seconds);
fprintf(fp, "(sec), hard ");
- fprintf(fp, "%llu", cfg->hard_use_expires_seconds);
+ fprintf(fp, "%llu", (unsigned long long) cfg->hard_use_expires_seconds);
fprintf(fp, "(sec)");
fprintf(fp, "%s", _SL_);
}
@@ -349,8 +349,8 @@
if (prefix)
fprintf(fp, prefix);
fprintf(fp, " ");
- fprintf(fp, "%llu(bytes), ", cur->bytes);
- fprintf(fp, "%llu(packets)", cur->packets);
+ fprintf(fp, "%llu(bytes), ", (unsigned long long) cur->bytes);
+ fprintf(fp, "%llu(packets)", (unsigned long long) cur->packets);
fprintf(fp, "%s", _SL_);
if (prefix)