From 530753184a21684c600ca137c123a5740817e570 Mon Sep 17 00:00:00 2001 From: Roman Mashak Date: Tue, 13 Dec 2016 15:31:16 -0500 Subject: [PATCH] tc: pass correct conversion specifier to print 'unsigned int' action index. Signed-off-by: Roman Mashak Signed-off-by: Jamal Hadi Salim --- tc/m_bpf.c | 2 +- tc/m_connmark.c | 2 +- tc/m_csum.c | 3 ++- tc/m_gact.c | 3 ++- tc/m_ife.c | 2 +- tc/m_ipt.c | 2 +- tc/m_mirred.c | 3 ++- tc/m_pedit.c | 2 +- tc/m_simple.c | 2 +- tc/m_skbedit.c | 2 +- tc/m_skbmod.c | 2 +- tc/m_vlan.c | 2 +- tc/m_xt.c | 2 +- tc/m_xt_old.c | 2 +- 14 files changed, 17 insertions(+), 14 deletions(-) diff --git a/tc/m_bpf.c b/tc/m_bpf.c index e26b85d0..f043ae48 100644 --- a/tc/m_bpf.c +++ b/tc/m_bpf.c @@ -178,7 +178,7 @@ static int bpf_print_opt(struct action_util *au, FILE *f, struct rtattr *arg) } fprintf(f, "default-action %s\n", action_n2a(parm->action)); - fprintf(f, "\tindex %d ref %d bind %d", parm->index, parm->refcnt, + fprintf(f, "\tindex %u ref %d bind %d", parm->index, parm->refcnt, parm->bindcnt); if (show_stats) { diff --git a/tc/m_connmark.c b/tc/m_connmark.c index 20f98e4f..295f90d5 100644 --- a/tc/m_connmark.c +++ b/tc/m_connmark.c @@ -123,7 +123,7 @@ static int print_connmark(struct action_util *au, FILE *f, struct rtattr *arg) ci = RTA_DATA(tb[TCA_CONNMARK_PARMS]); fprintf(f, " connmark zone %d\n", ci->zone); - fprintf(f, "\t index %d ref %d bind %d", ci->index, + fprintf(f, "\t index %u ref %d bind %d", ci->index, ci->refcnt, ci->bindcnt); if (show_stats) { diff --git a/tc/m_csum.c b/tc/m_csum.c index a6e4c1eb..d5b1af6f 100644 --- a/tc/m_csum.c +++ b/tc/m_csum.c @@ -199,7 +199,8 @@ print_csum(struct action_util *au, FILE *f, struct rtattr *arg) uflag_1, uflag_2, uflag_3, uflag_4, uflag_5, uflag_6, action_n2a(sel->action)); - fprintf(f, "\tindex %d ref %d bind %d", sel->index, sel->refcnt, sel->bindcnt); + fprintf(f, "\tindex %u ref %d bind %d", sel->index, sel->refcnt, + sel->bindcnt); if (show_stats) { if (tb[TCA_CSUM_TM]) { diff --git a/tc/m_gact.c b/tc/m_gact.c index dc04b9fd..755a3bee 100644 --- a/tc/m_gact.c +++ b/tc/m_gact.c @@ -224,7 +224,8 @@ print_gact(struct action_util *au, FILE * f, struct rtattr *arg) fprintf(f, "\n\t random type %s %s val %d", prob_n2a(pp->ptype), action_n2a(pp->paction), pp->pval); #endif - fprintf(f, "\n\t index %d ref %d bind %d", p->index, p->refcnt, p->bindcnt); + fprintf(f, "\n\t index %u ref %d bind %d", p->index, p->refcnt, + p->bindcnt); if (show_stats) { if (tb[TCA_GACT_TM]) { struct tcf_t *tm = RTA_DATA(tb[TCA_GACT_TM]); diff --git a/tc/m_ife.c b/tc/m_ife.c index e6f61535..f6131b13 100644 --- a/tc/m_ife.c +++ b/tc/m_ife.c @@ -312,7 +312,7 @@ static int print_ife(struct action_util *au, FILE *f, struct rtattr *arg) sizeof(b2))); } - fprintf(f, "\n\t index %d ref %d bind %d", p->index, p->refcnt, + fprintf(f, "\n\t index %u ref %d bind %d", p->index, p->refcnt, p->bindcnt); if (show_stats) { if (tb[TCA_IFE_TM]) { diff --git a/tc/m_ipt.c b/tc/m_ipt.c index d6f62bd6..1b935ec0 100644 --- a/tc/m_ipt.c +++ b/tc/m_ipt.c @@ -489,7 +489,7 @@ print_ipt(struct action_util *au, FILE * f, struct rtattr *arg) __u32 index; index = rta_getattr_u32(tb[TCA_IPT_INDEX]); - fprintf(f, "\n\tindex %d", index); + fprintf(f, "\n\tindex %u", index); } if (tb[TCA_IPT_CNT]) { diff --git a/tc/m_mirred.c b/tc/m_mirred.c index 01f916d5..e9438904 100644 --- a/tc/m_mirred.c +++ b/tc/m_mirred.c @@ -276,7 +276,8 @@ print_mirred(struct action_util *au, FILE * f, struct rtattr *arg) mirred_n2a(p->eaction), dev, action_n2a(p->action)); fprintf(f, "\n "); - fprintf(f, "\tindex %d ref %d bind %d", p->index, p->refcnt, p->bindcnt); + fprintf(f, "\tindex %u ref %d bind %d", p->index, p->refcnt, + p->bindcnt); if (show_stats) { if (tb[TCA_MIRRED_TM]) { diff --git a/tc/m_pedit.c b/tc/m_pedit.c index 891c2ec7..8e9bf072 100644 --- a/tc/m_pedit.c +++ b/tc/m_pedit.c @@ -527,7 +527,7 @@ int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg) fprintf(f, " pedit action %s keys %d\n ", action_n2a(sel->action), sel->nkeys); - fprintf(f, "\t index %d ref %d bind %d", sel->index, sel->refcnt, + fprintf(f, "\t index %u ref %d bind %d", sel->index, sel->refcnt, sel->bindcnt); if (show_stats) { diff --git a/tc/m_simple.c b/tc/m_simple.c index 732eaf1e..3a8bd916 100644 --- a/tc/m_simple.c +++ b/tc/m_simple.c @@ -187,7 +187,7 @@ static int print_simple(struct action_util *au, FILE *f, struct rtattr *arg) simpdata = RTA_DATA(tb[TCA_DEF_DATA]); fprintf(f, "Simple <%s>\n", simpdata); - fprintf(f, "\t index %d ref %d bind %d", sel->index, + fprintf(f, "\t index %u ref %d bind %d", sel->index, sel->refcnt, sel->bindcnt); if (show_stats) { diff --git a/tc/m_skbedit.c b/tc/m_skbedit.c index 368debc2..8660d603 100644 --- a/tc/m_skbedit.c +++ b/tc/m_skbedit.c @@ -214,7 +214,7 @@ static int print_skbedit(struct action_util *au, FILE *f, struct rtattr *arg) fprintf(f, " ptype %d", *ptype); } - fprintf(f, "\n\t index %d ref %d bind %d", + fprintf(f, "\n\t index %u ref %d bind %d", p->index, p->refcnt, p->bindcnt); if (show_stats) { diff --git a/tc/m_skbmod.c b/tc/m_skbmod.c index 0c293fc0..acb7771d 100644 --- a/tc/m_skbmod.c +++ b/tc/m_skbmod.c @@ -237,7 +237,7 @@ static int print_skbmod(struct action_util *au, FILE *f, struct rtattr *arg) if (p->flags & SKBMOD_F_SWAPMAC) fprintf(f, "swap mac "); - fprintf(f, "\n\t index %d ref %d bind %d", p->index, p->refcnt, + fprintf(f, "\n\t index %u ref %d bind %d", p->index, p->refcnt, p->bindcnt); if (show_stats) { if (tb[TCA_SKBMOD_TM]) { diff --git a/tc/m_vlan.c b/tc/m_vlan.c index b32f7460..44b93759 100644 --- a/tc/m_vlan.c +++ b/tc/m_vlan.c @@ -226,7 +226,7 @@ static int print_vlan(struct action_util *au, FILE *f, struct rtattr *arg) } fprintf(f, " %s", action_n2a(parm->action)); - fprintf(f, "\n\t index %d ref %d bind %d", parm->index, parm->refcnt, + fprintf(f, "\n\t index %u ref %d bind %d", parm->index, parm->refcnt, parm->bindcnt); if (show_stats) { diff --git a/tc/m_xt.c b/tc/m_xt.c index 028bad64..dbb54981 100644 --- a/tc/m_xt.c +++ b/tc/m_xt.c @@ -372,7 +372,7 @@ print_ipt(struct action_util *au, FILE *f, struct rtattr *arg) __u32 index; index = rta_getattr_u32(tb[TCA_IPT_INDEX]); - fprintf(f, "\n\tindex %d", index); + fprintf(f, "\n\tindex %u", index); } if (tb[TCA_IPT_CNT]) { diff --git a/tc/m_xt_old.c b/tc/m_xt_old.c index 20a6342b..e9cc624e 100644 --- a/tc/m_xt_old.c +++ b/tc/m_xt_old.c @@ -412,7 +412,7 @@ print_ipt(struct action_util *au, FILE * f, struct rtattr *arg) __u32 index; index = rta_getattr_u32(tb[TCA_IPT_INDEX]); - fprintf(f, "\n\tindex %d", index); + fprintf(f, "\n\tindex %u", index); } if (tb[TCA_IPT_CNT]) {