From 1401f6deb6758ef43ca4cd9c3f603e8e955b67f4 Mon Sep 17 00:00:00 2001 From: Antonio Fischetti Date: Fri, 23 Jun 2017 13:28:20 +0100 Subject: [PATCH] Fix coding style and some typos. Fixes some lines exceeding 80 chars and a couple of typos. Signed-off-by: Antonio Fischetti Signed-off-by: Ben Pfaff --- lib/conntrack.c | 2 +- lib/dpctl.c | 6 ++++-- lib/dpif-netdev.c | 2 +- utilities/ovs-dpctl.c | 6 ++++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/conntrack.c b/lib/conntrack.c index 90b154a87a7..c62ff2a60e3 100644 --- a/lib/conntrack.c +++ b/lib/conntrack.c @@ -1415,7 +1415,7 @@ extract_l4_icmp6(struct conn_key *key, const void *data, size_t size, * * If 'related' is not NULL and an ICMP error packet is being * processed, the function will extract the key from the packet nested - * in the ICMP paylod and set '*related' to true. + * in the ICMP payload and set '*related' to true. * * If 'related' is NULL, it means that we're already parsing a header nested * in an ICMP error. In this case, we skip checksum and length validation. */ diff --git a/lib/dpctl.c b/lib/dpctl.c index fa42078b0a2..86aae9dc7ac 100644 --- a/lib/dpctl.c +++ b/lib/dpctl.c @@ -1613,7 +1613,8 @@ static const struct dpctl_command all_commands[] = { { "set-if", "dp iface...", 2, INT_MAX, dpctl_set_if, DP_RW }, { "dump-dps", "", 0, 0, dpctl_dump_dps, DP_RO }, { "show", "[dp...]", 0, INT_MAX, dpctl_show, DP_RO }, - { "dump-flows", "[dp] [filter=..] [type=..]", 0, 3, dpctl_dump_flows, DP_RO }, + { "dump-flows", "[dp] [filter=..] [type=..]", + 0, 3, dpctl_dump_flows, DP_RO }, { "add-flow", "[dp] flow actions", 2, 3, dpctl_add_flow, DP_RW }, { "mod-flow", "[dp] flow actions", 2, 3, dpctl_mod_flow, DP_RW }, { "get-flow", "[dp] ufid", 1, 2, dpctl_get_flow, DP_RO }, @@ -1626,7 +1627,8 @@ static const struct dpctl_command all_commands[] = { /* Undocumented commands for testing. */ { "parse-actions", "actions", 1, INT_MAX, dpctl_parse_actions, DP_RO }, - { "normalize-actions", "actions", 2, INT_MAX, dpctl_normalize_actions, DP_RO }, + { "normalize-actions", "actions", + 2, INT_MAX, dpctl_normalize_actions, DP_RO }, { NULL, NULL, 0, 0, NULL, DP_RO }, }; diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 6bae4acd0dd..dd4072322a6 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -3021,7 +3021,7 @@ dpif_netdev_queue_to_priority(const struct dpif *dpif OVS_UNUSED, /* Creates and returns a new 'struct dp_netdev_actions', whose actions are - * a copy of the 'ofpacts_len' bytes of 'ofpacts'. */ + * a copy of the 'size' bytes of 'actions' input parameters. */ struct dp_netdev_actions * dp_netdev_actions_create(const struct nlattr *actions, size_t size) { diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c index aae8c93c9ee..b999d0bdd10 100644 --- a/utilities/ovs-dpctl.c +++ b/utilities/ovs-dpctl.c @@ -196,8 +196,10 @@ usage(void *userdata OVS_UNUSED) " get-flow [DP] ufid:UFID fetch flow corresponding to UFID\n" " del-flow [DP] FLOW delete FLOW from DP\n" " del-flows [DP] delete all flows from DP\n" - " dump-conntrack [DP] [zone=ZONE] display conntrack entries for ZONE\n" - " flush-conntrack [DP] [zone=ZONE] delete all conntrack entries in ZONE\n" + " dump-conntrack [DP] [zone=ZONE] " \ + "display conntrack entries for ZONE\n" + " flush-conntrack [DP] [zone=ZONE] " \ + "delete all conntrack entries in ZONE\n" "Each IFACE on add-dp, add-if, and set-if may be followed by\n" "comma-separated options. See ovs-dpctl(8) for syntax, or the\n" "Interface table in ovs-vswitchd.conf.db(5) for an options list.\n"