From: Stephen Hemminger <stephen@networkplumber.org>
Date: Sun, 26 Nov 2017 20:42:17 +0000 (-0800)
Subject: m_mirred: style cleanups
X-Git-Tag: v4.15.0~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6a656f4f9eaa563c760d1d2d72e7e044db03113;p=thirdparty%2Fiproute2.git

m_mirred: style cleanups

Fix whitespace and long lines.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---

diff --git a/tc/m_mirred.c b/tc/m_mirred.c
index c771632cc..3870d3a4a 100644
--- a/tc/m_mirred.c
+++ b/tc/m_mirred.c
@@ -28,13 +28,13 @@
 static void
 explain(void)
 {
-	fprintf(stderr, "Usage: mirred <DIRECTION> <ACTION> [index INDEX] <dev DEVICENAME>\n");
-	fprintf(stderr, "where:\n");
-	fprintf(stderr, "\tDIRECTION := <ingress | egress>\n");
-	fprintf(stderr, "\tACTION := <mirror | redirect>\n");
-	fprintf(stderr, "\tINDEX  is the specific policy instance id\n");
-	fprintf(stderr, "\tDEVICENAME is the devicename\n");
-
+	fprintf(stderr,
+		"Usage: mirred <DIRECTION> <ACTION> [index INDEX] <dev DEVICENAME>\n"
+		"where:\n"
+		"\tDIRECTION := <ingress | egress>\n"
+		"\tACTION := <mirror | redirect>\n"
+		"\tINDEX  is the specific policy instance id\n"
+		"\tDEVICENAME is the devicename\n");
 }
 
 static void
@@ -107,7 +107,8 @@ parse_direction(struct action_util *a, int *argc_p, char ***argv_p,
 		} else if (!egress && matches(*argv, "egress") == 0) {
 			egress = 1;
 			if (ingress) {
-				fprintf(stderr, "Can't have both egress and ingress\n");
+				fprintf(stderr,
+					"Can't have both egress and ingress\n");
 				return -1;
 			}
 			NEXT_ARG();
@@ -116,7 +117,8 @@ parse_direction(struct action_util *a, int *argc_p, char ***argv_p,
 		} else if (!ingress && matches(*argv, "ingress") == 0) {
 			ingress = 1;
 			if (egress) {
-				fprintf(stderr, "Can't have both ingress and egress\n");
+				fprintf(stderr,
+					"Can't have both ingress and egress\n");
 				return -1;
 			}
 			NEXT_ARG();
@@ -137,30 +139,35 @@ parse_direction(struct action_util *a, int *argc_p, char ***argv_p,
 					break;
 				}
 			} else if (!ok) {
-				fprintf(stderr, "was expecting egress or ingress (%s)\n", *argv);
+				fprintf(stderr,
+					"was expecting egress or ingress (%s)\n",
+					*argv);
 				break;
 
 			} else if (!mirror && matches(*argv, "mirror") == 0) {
 				mirror = 1;
 				if (redir) {
-					fprintf(stderr, "Can't have both mirror and redir\n");
+					fprintf(stderr,
+						"Can't have both mirror and redir\n");
 					return -1;
 				}
 				p.eaction = egress ? TCA_EGRESS_MIRROR :
-					    TCA_INGRESS_MIRROR;
+					TCA_INGRESS_MIRROR;
 				p.action = TC_ACT_PIPE;
 				ok++;
 			} else if (!redir && matches(*argv, "redirect") == 0) {
 				redir = 1;
 				if (mirror) {
-					fprintf(stderr, "Can't have both mirror and redir\n");
+					fprintf(stderr,
+						"Can't have both mirror and redir\n");
 					return -1;
 				}
 				p.eaction = egress ? TCA_EGRESS_REDIR :
-					    TCA_INGRESS_REDIR;
+					TCA_INGRESS_REDIR;
 				p.action = TC_ACT_STOLEN;
 				ok++;
-			} else if ((redir || mirror) && matches(*argv, "dev") == 0) {
+			} else if ((redir || mirror) &&
+				   matches(*argv, "dev") == 0) {
 				NEXT_ARG();
 				if (strlen(d))
 					duparg("dev", *argv);
@@ -177,18 +184,16 @@ parse_direction(struct action_util *a, int *argc_p, char ***argv_p,
 		NEXT_ARG();
 	}
 
-	if (!ok && !iok) {
+	if (!ok && !iok)
 		return -1;
-	}
-
-
 
 	if (d[0])  {
 		int idx;
 
 		ll_init_map(&rth);
 
-		if ((idx = ll_name_to_index(d)) == 0) {
+		idx = ll_name_to_index(d);
+		if (idx == 0) {
 			fprintf(stderr, "Cannot find device \"%s\"\n", d);
 			return -1;
 		}
@@ -204,16 +209,17 @@ parse_direction(struct action_util *a, int *argc_p, char ***argv_p,
 		if (iok && matches(*argv, "index") == 0) {
 			fprintf(stderr, "mirred: Illegal double index\n");
 			return -1;
-		} else {
-			if (matches(*argv, "index") == 0) {
-				NEXT_ARG();
-				if (get_u32(&p.index, *argv, 10)) {
-					fprintf(stderr, "mirred: Illegal \"index\"\n");
-					return -1;
-				}
-				argc--;
-				argv++;
+		}
+
+		if (matches(*argv, "index") == 0) {
+			NEXT_ARG();
+			if (get_u32(&p.index, *argv, 10)) {
+				fprintf(stderr,
+					"mirred: Illegal \"index\"\n");
+				return -1;
 			}
+			argc--;
+			argv++;
 		}
 	}
 
@@ -270,7 +276,7 @@ parse_mirred(struct action_util *a, int *argc_p, char ***argv_p,
 }
 
 static int
-print_mirred(struct action_util *au, FILE * f, struct rtattr *arg)
+print_mirred(struct action_util *au, FILE *f, struct rtattr *arg)
 {
 	struct tc_mirred *p;
 	struct rtattr *tb[TCA_MIRRED_MAX + 1];
@@ -287,12 +293,8 @@ print_mirred(struct action_util *au, FILE * f, struct rtattr *arg)
 	}
 	p = RTA_DATA(tb[TCA_MIRRED_PARMS]);
 
-	/*
-	ll_init_map(&rth);
-	*/
-
-
-	if ((dev = ll_index_to_name(p->ifindex)) == 0) {
+	dev = ll_index_to_name(p->ifindex);
+	if (dev == 0) {
 		fprintf(stderr, "Cannot find device %d\n", p->ifindex);
 		return -1;
 	}