Fix coding style and some typos.

Fixes some lines exceeding 80 chars and a couple of typos.

Signed-off-by: Antonio Fischetti <antonio.fischetti@intel.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>

diff --git a/lib/conntrack.c b/lib/conntrack.c
index 90b154a87a74b5e31f0a5652c116e1d0af83c9b0..c62ff2a60e343030444d604b0284bafc12929ba6 100644 (file)
--- 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 fa42078b0a2e78346be7cf394de73922e8167924..86aae9dc7ac3f6686d88c64220fa1fa9bd6147ef 100644 (file)
--- 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 6bae4acd0dd99869e82237c58e48cc671b5a5240..dd4072322a647811fbeb6dbf0032a047f646d609 100644 (file)
--- 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,
 
 \f
 /* 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 aae8c93c9eefd116e7362b1cc5e8bd1125b379a6..b999d0bdd1029177dc3801d999bec6f7dace6a56 100644 (file)
--- 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"