From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: [PATCH iproute2 16/22] tc/pedit: make functions static Date: Thu, 15 Nov 2018 14:36:34 -0800 Message-ID: <20181115223640.411-17-stephen@networkplumber.org> References: <20181115223640.411-1-stephen@networkplumber.org> Cc: Stephen Hemminger To: netdev@vger.kernel.org Return-path: Received: from mail-pl1-f196.google.com ([209.85.214.196]:38868 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389029AbeKPIqm (ORCPT ); Fri, 16 Nov 2018 03:46:42 -0500 Received: by mail-pl1-f196.google.com with SMTP id e5so126158plb.5 for ; Thu, 15 Nov 2018 14:36:58 -0800 (PST) In-Reply-To: <20181115223640.411-1-stephen@networkplumber.org> Sender: netdev-owner@vger.kernel.org List-ID: The parse and pack functions are only used by the pedit routines. Signed-off-by: Stephen Hemminger --- tc/m_pedit.c | 33 ++++++++++++++------------------- tc/m_pedit.h | 15 --------------- 2 files changed, 14 insertions(+), 34 deletions(-) diff --git a/tc/m_pedit.c b/tc/m_pedit.c index 2aeb56d9615f..6f8d078b7d3c 100644 --- a/tc/m_pedit.c +++ b/tc/m_pedit.c @@ -118,7 +118,7 @@ noexist: return p; } -int pack_key(struct m_pedit_sel *_sel, struct m_pedit_key *tkey) +static int pack_key(struct m_pedit_sel *_sel, struct m_pedit_key *tkey) { struct tc_pedit_sel *sel = &_sel->sel; struct m_pedit_key_ex *keys_ex = _sel->keys_ex; @@ -155,8 +155,8 @@ int pack_key(struct m_pedit_sel *_sel, struct m_pedit_key *tkey) return 0; } -int pack_key32(__u32 retain, struct m_pedit_sel *sel, - struct m_pedit_key *tkey) +static int pack_key32(__u32 retain, struct m_pedit_sel *sel, + struct m_pedit_key *tkey) { if (tkey->off > (tkey->off & ~3)) { fprintf(stderr, @@ -169,8 +169,8 @@ int pack_key32(__u32 retain, struct m_pedit_sel *sel, return pack_key(sel, tkey); } -int pack_key16(__u32 retain, struct m_pedit_sel *sel, - struct m_pedit_key *tkey) +static int pack_key16(__u32 retain, struct m_pedit_sel *sel, + struct m_pedit_key *tkey) { int ind, stride; __u32 m[4] = { 0x0000FFFF, 0xFF0000FF, 0xFFFF0000 }; @@ -197,10 +197,10 @@ int pack_key16(__u32 retain, struct m_pedit_sel *sel, printf("pack_key16: Final val %08x mask %08x\n", tkey->val, tkey->mask); return pack_key(sel, tkey); - } -int pack_key8(__u32 retain, struct m_pedit_sel *sel, struct m_pedit_key *tkey) +static int pack_key8(__u32 retain, struct m_pedit_sel *sel, + struct m_pedit_key *tkey) { int ind, stride; __u32 m[4] = { 0x00FFFFFF, 0xFF00FFFF, 0xFFFF00FF, 0xFFFFFF00 }; @@ -283,7 +283,7 @@ static int pack_ipv6(struct m_pedit_sel *sel, struct m_pedit_key *tkey, return 0; } -int parse_val(int *argc_p, char ***argv_p, __u32 *val, int type) +static int parse_val(int *argc_p, char ***argv_p, __u32 *val, int type) { int argc = *argc_p; char **argv = *argv_p; @@ -433,8 +433,8 @@ done: } -int parse_offset(int *argc_p, char ***argv_p, struct m_pedit_sel *sel, - struct m_pedit_key *tkey) +static int parse_offset(int *argc_p, char ***argv_p, struct m_pedit_sel *sel, + struct m_pedit_key *tkey) { int off; __u32 len, retain; @@ -612,8 +612,8 @@ static int pedit_keys_ex_addattr(struct m_pedit_sel *sel, struct nlmsghdr *n) return 0; } -int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, - struct nlmsghdr *n) +static int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p, + int tca_id, struct nlmsghdr *n) { struct m_pedit_sel sel = {}; @@ -705,7 +705,7 @@ int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, return 0; } -const char *pedit_htype_str[] = { +static const char * const pedit_htype_str[] = { [TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK] = "", [TCA_PEDIT_KEY_EX_HDR_TYPE_ETH] = "eth", [TCA_PEDIT_KEY_EX_HDR_TYPE_IP4] = "ipv4", @@ -730,7 +730,7 @@ static void print_pedit_location(FILE *f, fprintf(f, "%c%d", (int)off >= 0 ? '+' : '-', abs((int)off)); } -int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg) +static int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg) { struct tc_pedit_sel *sel; struct rtattr *tb[TCA_PEDIT_MAX + 1]; @@ -826,11 +826,6 @@ int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg) return 0; } -int pedit_print_xstats(struct action_util *au, FILE *f, struct rtattr *xstats) -{ - return 0; -} - struct action_util pedit_action_util = { .id = "pedit", .parse_aopt = parse_pedit, diff --git a/tc/m_pedit.h b/tc/m_pedit.h index b6b274bd08c7..5d3628a70b99 100644 --- a/tc/m_pedit.h +++ b/tc/m_pedit.h @@ -71,22 +71,7 @@ struct m_pedit_util { struct m_pedit_key *tkey); }; -int pack_key(struct m_pedit_sel *sel, struct m_pedit_key *tkey); -int pack_key32(__u32 retain, struct m_pedit_sel *sel, - struct m_pedit_key *tkey); -int pack_key16(__u32 retain, struct m_pedit_sel *sel, - struct m_pedit_key *tkey); -int pack_key8(__u32 retain, struct m_pedit_sel *sel, - struct m_pedit_key *tkey); -int parse_val(int *argc_p, char ***argv_p, __u32 *val, int type); int parse_cmd(int *argc_p, char ***argv_p, __u32 len, int type, __u32 retain, struct m_pedit_sel *sel, struct m_pedit_key *tkey); -int parse_offset(int *argc_p, char ***argv_p, - struct m_pedit_sel *sel, struct m_pedit_key *tkey); -int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p, - int tca_id, struct nlmsghdr *n); -int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg); -int pedit_print_xstats(struct action_util *au, FILE *f, - struct rtattr *xstats); #endif -- 2.17.1