tc/util: remove unused argument from print_action_control

The FILE handle is no longer used.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/tc/m_bpf.c b/tc/m_bpf.c
index 3083ff689bab2df91d5a686b7666b03f0323b6ee..a5de7da1fc3ec628931f6f0d32eb9f871ed868e7 100644 (file)
--- a/tc/m_bpf.c
+++ b/tc/m_bpf.c
@@ -191,7 +191,7 @@ static int bpf_print_opt(const struct action_util *au, FILE *f, struct rtattr *a
                             b, sizeof(b)));
        }
 
-       print_action_control(f, "default-action ", parm->action, _SL_);
+       print_action_control("default-action ", parm->action, _SL_);
        print_uint(PRINT_ANY, "index", "\t index %u", parm->index);
        print_int(PRINT_ANY, "ref", " ref %d", parm->refcnt);
        print_int(PRINT_ANY, "bind", " bind %d", parm->bindcnt);

diff --git a/tc/m_connmark.c b/tc/m_connmark.c
index 19715016b2f8d52b9e30a3570d786f10dc6ac513..fa5ae79b40fee241ff38f92483f572a46039f8a6 100644 (file)
--- a/tc/m_connmark.c
+++ b/tc/m_connmark.c
@@ -112,7 +112,7 @@ static int print_connmark(const struct action_util *au, FILE *f, struct rtattr *
        ci = RTA_DATA(tb[TCA_CONNMARK_PARMS]);
 
        print_uint(PRINT_ANY, "zone", "zone %u", ci->zone);
-       print_action_control(f, " ", ci->action, "");
+       print_action_control(" ", ci->action, "");
 
        print_nl();
        print_uint(PRINT_ANY, "index", "\t index %u", ci->index);

diff --git a/tc/m_csum.c b/tc/m_csum.c
index 9f4c0078412ec89352b27c0d91790d14a542326d..f558d97944907519c5de5a07dc74ed276a57776a 100644 (file)
--- a/tc/m_csum.c
+++ b/tc/m_csum.c
@@ -204,7 +204,7 @@ print_csum(const struct action_util *au, FILE *f, struct rtattr *arg)
                 uflag_4, uflag_5, uflag_6, uflag_7);
        print_string(PRINT_ANY, "csum", "(%s) ", buf);
 
-       print_action_control(f, "action ", sel->action, _SL_);
+       print_action_control("action ", sel->action, _SL_);
        print_uint(PRINT_ANY, "index", "\tindex %u", sel->index);
        print_int(PRINT_ANY, "ref", " ref %d", sel->refcnt);
        print_int(PRINT_ANY, "bind", " bind %d", sel->bindcnt);

diff --git a/tc/m_ct.c b/tc/m_ct.c
index f1f47aca0ca07e2c8444fad0e6c9e8d6a362572a..e549cb9c5964937de4cf732321c7655f83c3d3a4 100644 (file)
--- a/tc/m_ct.c
+++ b/tc/m_ct.c
@@ -523,7 +523,7 @@ static int print_ct(const struct action_util *au, FILE *f, struct rtattr *arg)
        ct_print_helper(tb[TCA_CT_HELPER_FAMILY], tb[TCA_CT_HELPER_PROTO], tb[TCA_CT_HELPER_NAME]);
        ct_print_nat(ct_action, tb);
 
-       print_action_control(f, " ", p->action, "");
+       print_action_control(" ", p->action, "");
 
        print_nl();
        print_uint(PRINT_ANY, "index", "\t index %u", p->index);

diff --git a/tc/m_ctinfo.c b/tc/m_ctinfo.c
index 62f0b7d5279b73feb7e13147f0f40478591f681c..41449c11c928ca03973e02153f521c6e7af16ce9 100644 (file)
--- a/tc/m_ctinfo.c
+++ b/tc/m_ctinfo.c
@@ -236,7 +236,7 @@ static int print_ctinfo(const struct action_util *au, FILE *f, struct rtattr *ar
                zone = rta_getattr_u16(tb[TCA_CTINFO_ZONE]);
 
        print_hu(PRINT_ANY, "zone", "zone %u", zone);
-       print_action_control(f, " ", ci->action, "");
+       print_action_control(" ", ci->action, "");
 
        print_nl();
        print_uint(PRINT_ANY, "index", "\t index %u", ci->index);

diff --git a/tc/m_gact.c b/tc/m_gact.c
index ce32fe306958b101f973a3aa4fc53966bb1593ae..854d823e9b3cda3f570393a77be815ee29989dfc 100644 (file)
--- a/tc/m_gact.c
+++ b/tc/m_gact.c
@@ -178,7 +178,7 @@ print_gact(const struct action_util *au, FILE *f, struct rtattr *arg)
        }
        p = RTA_DATA(tb[TCA_GACT_PARMS]);
 
-       print_action_control(f, "action ", p->action, "");
+       print_action_control("action ", p->action, "");
 #ifdef CONFIG_GACT_PROB
        if (tb[TCA_GACT_PROB] != NULL) {
                pp = RTA_DATA(tb[TCA_GACT_PROB]);
@@ -191,7 +191,7 @@ print_gact(const struct action_util *au, FILE *f, struct rtattr *arg)
        print_nl();
        print_string(PRINT_ANY, "random_type", "\t random type %s",
                     prob_n2a(pp->ptype));
-       print_action_control(f, " ", pp->paction, " ");
+       print_action_control(" ", pp->paction, " ");
        print_int(PRINT_ANY, "val", "val %d", pp->pval);
        close_json_object();
 #endif

diff --git a/tc/m_gate.c b/tc/m_gate.c
index 5d8639f9fd459667e55698e55a379d268f29b2e5..d71dd609fb1ca748bb1b36d673a46f760df86d6a 100644 (file)
--- a/tc/m_gate.c
+++ b/tc/m_gate.c
@@ -517,7 +517,7 @@ static int print_gate(const struct action_util *au, FILE *f, struct rtattr *arg)
        if (tb[TCA_GATE_ENTRY_LIST])
                print_gate_list(tb[TCA_GATE_ENTRY_LIST]);
 
-       print_action_control(f, "\t", parm->action, "");
+       print_action_control("\t", parm->action, "");
 
        print_uint(PRINT_ANY, "index", "\n\t index %u", parm->index);
        print_int(PRINT_ANY, "ref", " ref %d", parm->refcnt);

diff --git a/tc/m_ife.c b/tc/m_ife.c
index f6f41b5469b56086ed48bc6b0134b5c5b0b71f5d..90bc7a5b04f64a02b4ff41050ae44133caef75b3 100644 (file)
--- a/tc/m_ife.c
+++ b/tc/m_ife.c
@@ -236,7 +236,7 @@ static int print_ife(const struct action_util *au, FILE *f, struct rtattr *arg)
 
        print_string(PRINT_ANY, "mode", "%s ",
                     p->flags & IFE_ENCODE ? "encode" : "decode");
-       print_action_control(f, "action ", p->action, " ");
+       print_action_control("action ", p->action, " ");
 
        if (tb[TCA_IFE_TYPE]) {
                ife_type = rta_getattr_u16(tb[TCA_IFE_TYPE]);

diff --git a/tc/m_mirred.c b/tc/m_mirred.c
index b3da74f2e8cbad00f9a29dac7b74f88f9c767189..f4da3c76284460d7f4bb73c7c3c172732f054632 100644 (file)
--- a/tc/m_mirred.c
+++ b/tc/m_mirred.c
@@ -337,7 +337,7 @@ print_mirred(const struct action_util *au, FILE *f, struct rtattr *arg)
                print_string(PRINT_ANY, "to_dev", " to device %s)", dev);
        }
 
-       print_action_control(f, " ", p->action, "");
+       print_action_control(" ", p->action, "");
 
        print_nl();
        print_uint(PRINT_ANY, "index", "\tindex %u", p->index);

diff --git a/tc/m_mpls.c b/tc/m_mpls.c
index 5ef7d45f22d4f59938de4acb3918bd9da9bdf11e..89137456b90a053e34d4f1d42617654e7d3b700c 100644 (file)
--- a/tc/m_mpls.c
+++ b/tc/m_mpls.c
@@ -272,7 +272,7 @@ static int print_mpls(const struct action_util *au, FILE *f, struct rtattr *arg)
                }
                break;
        }
-       print_action_control(f, " ", parm->action, "");
+       print_action_control(" ", parm->action, "");
 
        print_nl();
        print_uint(PRINT_ANY, "index", "\t index %u", parm->index);

diff --git a/tc/m_nat.c b/tc/m_nat.c
index 8218a699f4a9b17fde0333ae7215dcc49ed21b70..69d54c6ffbe5089987696bc91556ec6d291f66e7 100644 (file)
--- a/tc/m_nat.c
+++ b/tc/m_nat.c
@@ -169,7 +169,7 @@ print_nat(const struct action_util *au, FILE * f, struct rtattr *arg)
        print_string(PRINT_ANY, "new_addr", " %s",
                     format_host_r(AF_INET, 4, &sel->new_addr, buf1, sizeof(buf1)));
 
-       print_action_control(f, " ", sel->action, "");
+       print_action_control(" ", sel->action, "");
        print_nl();
        print_uint(PRINT_ANY, "index", "\t index %u", sel->index);
        print_int(PRINT_ANY, "ref", " ref %d", sel->refcnt);

diff --git a/tc/m_pedit.c b/tc/m_pedit.c
index 78b051ec74a17fedce367dc7f709655661bc0626..040d61688de56b71b62e31345848b91618980e5d 100644 (file)
--- a/tc/m_pedit.c
+++ b/tc/m_pedit.c
@@ -791,7 +791,7 @@ static int print_pedit(const struct action_util *au, FILE *f, struct rtattr *arg
                }
        }
 
-       print_action_control(f, "action ", sel->action, " ");
+       print_action_control("action ", sel->action, " ");
        print_uint(PRINT_ANY, "nkeys", "keys %d\n", sel->nkeys);
        print_uint(PRINT_ANY, "index", " \t index %u", sel->index);
        print_int(PRINT_ANY, "ref", " ref %d", sel->refcnt);

diff --git a/tc/m_police.c b/tc/m_police.c
index f9a5753b6b83ebde5f813a66c0d8b3feb54af37a..7fb710b0daf37aa22881c9cf6704ef5d1f8c21e3 100644 (file)
--- a/tc/m_police.c
+++ b/tc/m_police.c
@@ -325,12 +325,12 @@ static int print_police(const struct action_util *a, FILE *f, struct rtattr *arg
                print_u64(PRINT_ANY, "pkts_burst", "pkts_burst %llu ", ppsburst64);
        }
 
-       print_action_control(f, "action ", p->action, "");
+       print_action_control("action ", p->action, "");
 
        if (tb[TCA_POLICE_RESULT]) {
                __u32 action = rta_getattr_u32(tb[TCA_POLICE_RESULT]);
 
-               print_action_control(f, "/", action, " ");
+               print_action_control("/", action, " ");
        } else {
                print_string(PRINT_FP, NULL, " ", NULL);
        }

diff --git a/tc/m_sample.c b/tc/m_sample.c
index 092d35d9e4451d9591d4f7b0148f8a1ec418cd76..5fd2b841590c51f91a79befa34f2876705f329f0 100644 (file)
--- a/tc/m_sample.c
+++ b/tc/m_sample.c
@@ -160,7 +160,7 @@ static int print_sample(const struct action_util *au, FILE *f, struct rtattr *ar
                print_uint(PRINT_ANY, "trunc_size", " trunc_size %u",
                           rta_getattr_u32(tb[TCA_SAMPLE_TRUNC_SIZE]));
 
-       print_action_control(f, " ", p->action, "");
+       print_action_control(" ", p->action, "");
 
        print_nl();
        print_uint(PRINT_ANY, "index", "\t index %u", p->index);

diff --git a/tc/m_skbedit.c b/tc/m_skbedit.c
index 16511b0a15bf9e7162595be870ced29991cd4878..5c9b2f246cc4e597a9212f3f60d205c4f57f3503 100644 (file)
--- a/tc/m_skbedit.c
+++ b/tc/m_skbedit.c
@@ -239,7 +239,7 @@ static int print_skbedit(const struct action_util *au, FILE *f, struct rtattr *a
                                     "inheritdsfield");
        }
 
-       print_action_control(f, " ", p->action, "");
+       print_action_control(" ", p->action, "");
 
        print_nl();
        print_uint(PRINT_ANY, "index", "\t index %u", p->index);

diff --git a/tc/m_skbmod.c b/tc/m_skbmod.c
index d71f2118588366de88bb972c652ea7d3e34be341..a13581be26724c8129bbad91ac6895603c506e8d 100644 (file)
--- a/tc/m_skbmod.c
+++ b/tc/m_skbmod.c
@@ -178,7 +178,7 @@ static int print_skbmod(const struct action_util *au, FILE *f, struct rtattr *ar
        p = RTA_DATA(tb[TCA_SKBMOD_PARMS]);
 
        print_string(PRINT_FP, NULL, "skbmod ", NULL);
-       print_action_control(f, "", p->action, " ");
+       print_action_control("", p->action, " ");
 
        if (tb[TCA_SKBMOD_ETYPE]) {
                skbmod_etype = rta_getattr_u16(tb[TCA_SKBMOD_ETYPE]);

diff --git a/tc/m_tunnel_key.c b/tc/m_tunnel_key.c
index 2a571a6b71b3facd3a92e1cfa88e7a0bae897b63..b65d88e09942784493adae958bdd61ddf025cddc 100644 (file)
--- a/tc/m_tunnel_key.c
+++ b/tc/m_tunnel_key.c
@@ -731,7 +731,7 @@ static int print_tunnel_key(const struct action_util *au, FILE *f, struct rtattr
                                          tb[TCA_TUNNEL_KEY_ENC_TTL]);
                break;
        }
-       print_action_control(f, " ", parm->action, "");
+       print_action_control(" ", parm->action, "");
 
        print_nl();
        print_uint(PRINT_ANY, "index", "\t index %u", parm->index);

diff --git a/tc/m_vlan.c b/tc/m_vlan.c
index f383173f5bb95e7c6dbc362cd32160fe23eed00d..5ff8c712264a31aaf802e0bfe207470ae81633dc 100644 (file)
--- a/tc/m_vlan.c
+++ b/tc/m_vlan.c
@@ -282,7 +282,7 @@ static int print_vlan(const struct action_util *au, FILE *f, struct rtattr *arg)
                        print_string(PRINT_ANY, "src_mac", " src_mac %s", b1);
                }
        }
-       print_action_control(f, " ", parm->action, "");
+       print_action_control(" ", parm->action, "");
 
        print_nl();
        print_uint(PRINT_ANY, "index", "\t index %u", parm->index);

diff --git a/tc/tc_util.c b/tc/tc_util.c
index a2d1d1dfbdd0f2b057284883b2d5d45e2e18f45e..c0be4f25f210ec9da490fdea7cf88c51746ead0f 100644 (file)
--- a/tc/tc_util.c
+++ b/tc/tc_util.c
@@ -534,8 +534,7 @@ int parse_action_control_slash(int *argc_p, char ***argv_p,
        return 0;
 }
 
-void print_action_control(FILE *f, const char *prefix,
-                         int action, const char *suffix)
+void print_action_control(const char *prefix, int action, const char *suffix)
 {
        print_string(PRINT_FP, NULL, "%s", prefix);
        open_json_object("control_action");

diff --git a/tc/tc_util.h b/tc/tc_util.h
index 43032e78191cea7b4209b23af07661c9c7f750a7..444293853439c5cfd04a4500861c13b42b118d2d 100644 (file)
--- a/tc/tc_util.h
+++ b/tc/tc_util.h
@@ -109,8 +109,7 @@ void parse_action_control_dflt(int *argc_p, char ***argv_p,
                               int default_result);
 int parse_action_control_slash(int *argc_p, char ***argv_p,
                               int *result1_p, int *result2_p, bool allow_num);
-void print_action_control(FILE *f, const char *prefix,
-                         int action, const char *suffix);
+void print_action_control(const char *prefix, int action, const char *suffix);
 int police_print_xstats(const struct action_util *a, FILE *f, struct rtattr *tb);
 int tc_print_action(FILE *f, const struct rtattr *tb, unsigned short tot_acts);
 int parse_action(int *argc_p, char ***argv_p, int tca_id, struct nlmsghdr *n);