From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Tue, 10 Nov 2009 17:01:57 +0000 (-0800)
Subject: Consolidate fprintf statements
X-Git-Tag: v2.6.31~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a1c7fcb2756be05b55008edbd9e813f590cdf01;p=thirdparty%2Fiproute2.git

Consolidate fprintf statements

Doing one item per call is like old MODULA2 code.
---

diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c
index 708ce9fe5..18250de82 100644
--- a/ip/ipxfrm.c
+++ b/ip/ipxfrm.c
@@ -351,16 +351,12 @@ void xfrm_stats_print(struct xfrm_stats *s, FILE *fp, const char *prefix)
 {
 	if (prefix)
 		fputs(prefix, fp);
-	fprintf(fp, "stats:");
-	fprintf(fp, "%s", _SL_);
+	fprintf(fp, "stats:%s", _SL_);
 
 	if (prefix)
 		fputs(prefix, fp);
-	fprintf(fp, "  ");
-	fprintf(fp, "replay-window %u ", s->replay_window);
-	fprintf(fp, "replay %u ", s->replay);
-	fprintf(fp, "failed %u", s->integrity_failed);
-	fprintf(fp, "%s", _SL_);
+	fprintf(fp, "  replay-window %u replay %u failed %u%s", 
+		s->replay_window, s->replay, s->integrity_failed, _SL_);
 }
 
 static const char *strxf_time(__u64 time)
@@ -392,72 +388,52 @@ void xfrm_lifetime_print(struct xfrm_lifetime_cfg *cfg,
 	if (cfg) {
 		if (prefix)
 			fputs(prefix, fp);
-		fprintf(fp, "lifetime config:");
-		fprintf(fp, "%s", _SL_);
+		fprintf(fp, "lifetime config:%s",_SL_);
 
 		if (prefix)
 			fputs(prefix, fp);
-		fprintf(fp, "  ");
-		fprintf(fp, "limit: ");
-		fprintf(fp, "soft ");
-		fprintf(fp, strxf_limit(cfg->soft_byte_limit));
-		fprintf(fp, "(bytes), hard ");
-		fprintf(fp, strxf_limit(cfg->hard_byte_limit));
-		fprintf(fp, "(bytes)");
-		fprintf(fp, "%s", _SL_);
+		fprintf(fp, "  limit: soft %s(bytes),",
+			strxf_limit(cfg->soft_byte_limit));
+		fprintf(fp, " hard %s(bytes)%s",
+			strxf_limit(cfg->hard_byte_limit), _SL_);
 
 		if (prefix)
 			fputs(prefix, fp);
-		fprintf(fp, "  ");
-		fprintf(fp, "limit: ");
-		fprintf(fp, "soft ");
-		fprintf(fp, strxf_limit(cfg->soft_packet_limit));
-		fprintf(fp, "(packets), hard ");
-		fprintf(fp, strxf_limit(cfg->hard_packet_limit));
-		fprintf(fp, "(packets)");
-		fprintf(fp, "%s", _SL_);
+		fprintf(fp, "  limit: soft %s(packets),",
+			strxf_limit(cfg->soft_packet_limit));
+		fprintf(fp, " hard %s(packets)%s",
+			strxf_limit(cfg->hard_packet_limit), _SL_);
 
 		if (prefix)
 			fputs(prefix, fp);
-		fprintf(fp, "  ");
-		fprintf(fp, "expire add: ");
-		fprintf(fp, "soft ");
-		fprintf(fp, "%llu", (unsigned long long) cfg->soft_add_expires_seconds);
-		fprintf(fp, "(sec), hard ");
-		fprintf(fp, "%llu", (unsigned long long) cfg->hard_add_expires_seconds);
-		fprintf(fp, "(sec)");
-		fprintf(fp, "%s", _SL_);
+		fprintf(fp, "  expire add: soft %llu(sec), hard %llu(sec)%s", 
+			(unsigned long long) cfg->soft_add_expires_seconds,
+			(unsigned long long) cfg->hard_add_expires_seconds,
+			_SL_);
 
 		if (prefix)
 			fputs(prefix, fp);
-		fprintf(fp, "  ");
-		fprintf(fp, "expire use: ");
-		fprintf(fp, "soft ");
-		fprintf(fp, "%llu", (unsigned long long) cfg->soft_use_expires_seconds);
-		fprintf(fp, "(sec), hard ");
-		fprintf(fp, "%llu", (unsigned long long) cfg->hard_use_expires_seconds);
-		fprintf(fp, "(sec)");
-		fprintf(fp, "%s", _SL_);
+		fprintf(fp, "  expire use: soft %llu(sec), hard %llu(sec)%s",
+			(unsigned long long) cfg->soft_use_expires_seconds,
+			(unsigned long long) cfg->hard_use_expires_seconds,
+			_SL_);
 	}
 	if (cur) {
 		if (prefix)
 			fputs(prefix, fp);
-		fprintf(fp, "lifetime current:");
-		fprintf(fp, "%s", _SL_);
+		fprintf(fp, "lifetime current:%s", _SL_);
 
 		if (prefix)
 			fputs(prefix, fp);
-		fprintf(fp, "  ");
-		fprintf(fp, "%llu(bytes), ", (unsigned long long) cur->bytes);
-		fprintf(fp, "%llu(packets)", (unsigned long long) cur->packets);
-		fprintf(fp, "%s", _SL_);
+		fprintf(fp, "  %llu(bytes), %llu(packets)%s",
+			(unsigned long long) cur->bytes,
+			(unsigned long long) cur->packets,
+			 _SL_);
 
 		if (prefix)
 			fputs(prefix, fp);
-		fprintf(fp, "  ");
-		fprintf(fp, "add %s ", strxf_time(cur->add_time));
-		fprintf(fp, "use %s", strxf_time(cur->use_time));
-		fprintf(fp, "%s", _SL_);
+		fprintf(fp, "  add %s ", strxf_time(cur->add_time));
+		fprintf(fp, "use %s%s", strxf_time(cur->use_time), _SL_);
 	}
 }