From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f68.google.com ([209.85.160.68]:46084 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750769AbeCFG6j (ORCPT ); Tue, 6 Mar 2018 01:58:39 -0500 Received: by mail-pl0-f68.google.com with SMTP id y8-v6so11348219pll.13 for ; Mon, 05 Mar 2018 22:58:39 -0800 (PST) From: Stephen Hemminger To: dsahern@gmail.com, sd@queasysnail.net Cc: netdev@vger.kernel.org, Stephen Hemminger , Stephen Hemminger Subject: [PATCH iproute2-next 1/3] ip: macsec cleanup Date: Mon, 5 Mar 2018 22:58:28 -0800 Message-Id: <20180306065830.8961-2-stephen@networkplumber.org> In-Reply-To: <20180306065830.8961-1-stephen@networkplumber.org> References: <20180306065830.8961-1-stephen@networkplumber.org> Sender: netdev-owner@vger.kernel.org List-ID: From: Stephen Hemminger Break long lines and use const as recommended by checkpatch. Signed-off-by: Stephen Hemminger --- ip/ipmacsec.c | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/ip/ipmacsec.c b/ip/ipmacsec.c index c0b45f5a12d5..37faed821c10 100644 --- a/ip/ipmacsec.c +++ b/ip/ipmacsec.c @@ -23,9 +23,9 @@ #include "ll_map.h" #include "libgenl.h" -static const char *values_on_off[] = { "off", "on" }; +static const char * const values_on_off[] = { "off", "on" }; -static const char *VALIDATE_STR[] = { +static const char * const validate_str[] = { [MACSEC_VALIDATE_DISABLED] = "disabled", [MACSEC_VALIDATE_CHECK] = "check", [MACSEC_VALIDATE_STRICT] = "strict", @@ -81,26 +81,27 @@ static int genl_family = -1; static void ipmacsec_usage(void) { - fprintf(stderr, "Usage: ip macsec add DEV tx sa { 0..3 } [ OPTS ] key ID KEY\n"); - fprintf(stderr, " ip macsec set DEV tx sa { 0..3 } [ OPTS ]\n"); - fprintf(stderr, " ip macsec del DEV tx sa { 0..3 }\n"); - fprintf(stderr, " ip macsec add DEV rx SCI [ on | off ]\n"); - fprintf(stderr, " ip macsec set DEV rx SCI [ on | off ]\n"); - fprintf(stderr, " ip macsec del DEV rx SCI\n"); - fprintf(stderr, " ip macsec add DEV rx SCI sa { 0..3 } [ OPTS ] key ID KEY\n"); - fprintf(stderr, " ip macsec set DEV rx SCI sa { 0..3 } [ OPTS ]\n"); - fprintf(stderr, " ip macsec del DEV rx SCI sa { 0..3 }\n"); - fprintf(stderr, " ip macsec show\n"); - fprintf(stderr, " ip macsec show DEV\n"); - fprintf(stderr, "where OPTS := [ pn ] [ on | off ]\n"); - fprintf(stderr, " ID := 128-bit hex string\n"); - fprintf(stderr, " KEY := 128-bit hex string\n"); - fprintf(stderr, " SCI := { sci | port { 1..2^16-1 } address }\n"); + fprintf(stderr, + "Usage: ip macsec add DEV tx sa { 0..3 } [ OPTS ] key ID KEY\n" + " ip macsec set DEV tx sa { 0..3 } [ OPTS ]\n" + " ip macsec del DEV tx sa { 0..3 }\n" + " ip macsec add DEV rx SCI [ on | off ]\n" + " ip macsec set DEV rx SCI [ on | off ]\n" + " ip macsec del DEV rx SCI\n" + " ip macsec add DEV rx SCI sa { 0..3 } [ OPTS ] key ID KEY\n" + " ip macsec set DEV rx SCI sa { 0..3 } [ OPTS ]\n" + " ip macsec del DEV rx SCI sa { 0..3 }\n" + " ip macsec show\n" + " ip macsec show DEV\n" + "where OPTS := [ pn ] [ on | off ]\n" + " ID := 128-bit hex string\n" + " KEY := 128-bit hex string\n" + " SCI := { sci | port { 1..2^16-1 } address }\n"); exit(-1); } -static int one_of(const char *msg, const char *realval, const char **list, +static int one_of(const char *msg, const char *realval, const char * const *list, size_t len, int *index) { int i; @@ -597,7 +598,7 @@ static void print_attrs(const char *prefix, struct rtattr *attrs[]) if (attrs[MACSEC_SECY_ATTR_VALIDATE]) { __u8 val = rta_getattr_u8(attrs[MACSEC_SECY_ATTR_VALIDATE]); - printf("validate %s ", VALIDATE_STR[val]); + printf("validate %s ", validate_str[val]); } print_flag(stdout, attrs, "sc", MACSEC_RXSC_ATTR_ACTIVE); @@ -1077,7 +1078,7 @@ static void macsec_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) print_string(PRINT_ANY, "validation", "validate %s ", - VALIDATE_STR[val]); + validate_str[val]); } const char *inc_sci, *es, *replay; @@ -1241,7 +1242,7 @@ static int macsec_parse_opt(struct link_util *lu, int argc, char **argv, } else if (strcmp(*argv, "validate") == 0) { NEXT_ARG(); ret = one_of("validate", *argv, - VALIDATE_STR, ARRAY_SIZE(VALIDATE_STR), + validate_str, ARRAY_SIZE(validate_str), (int *)&validate); if (ret != 0) return ret; @@ -1265,7 +1266,8 @@ static int macsec_parse_opt(struct link_util *lu, int argc, char **argv, } if (!check_txsc_flags(es, scb, send_sci)) { - fprintf(stderr, "invalid combination of send_sci/end_station/scb\n"); + fprintf(stderr, + "invalid combination of send_sci/end_station/scb\n"); return -1; } -- 2.16.1