VPP-327 Coding standards cleanup for vppinfra

[vpp.git] / vppinfra / vppinfra / graph.c

diff --git a/vppinfra/vppinfra/graph.c b/vppinfra/vppinfra/graph.c
index d1f648a..98a2904 100644 (file)
--- a/vppinfra/vppinfra/graph.c
+++ b/vppinfra/vppinfra/graph.c
@@ -15,18 +15,19 @@
 #include <vppinfra/graph.h>
 
 /* Set link distance, creating link if not found. */
-u32 graph_set_link (graph_t * g, u32 src, u32 dst, u32 distance)
+u32
+graph_set_link (graph_t * g, u32 src, u32 dst, u32 distance)
 {
-  graph_node_t * src_node, * dst_node;
-  graph_link_t * l;
+  graph_node_t *src_node, *dst_node;
+  graph_link_t *l;
   u32 old_distance;
-  
+
   /* The following validate will not work if src or dst are on the
      pool free list. */
   if (src < vec_len (g->nodes))
-    ASSERT (! pool_is_free_index (g->nodes, src));
+    ASSERT (!pool_is_free_index (g->nodes, src));
   if (dst < vec_len (g->nodes))
-    ASSERT (! pool_is_free_index (g->nodes, dst));
+    ASSERT (!pool_is_free_index (g->nodes, dst));
 
   /* Make new (empty) nodes to make src and dst valid. */
   pool_validate_index (g->nodes, clib_max (src, dst));
@@ -62,10 +63,11 @@ u32 graph_set_link (graph_t * g, u32 src, u32 dst, u32 distance)
   return old_distance;
 }
 
-void graph_del_link (graph_t * g, u32 src, u32 dst)
+void
+graph_del_link (graph_t * g, u32 src, u32 dst)
 {
-  graph_node_t * src_node, * dst_node;
-  
+  graph_node_t *src_node, *dst_node;
+
   src_node = pool_elt_at_index (g->nodes, src);
   dst_node = pool_elt_at_index (g->nodes, dst);
 
@@ -74,25 +76,26 @@ void graph_del_link (graph_t * g, u32 src, u32 dst)
 }
 
 /* Delete source node and all links from other nodes from/to source. */
-uword graph_del_node (graph_t * g, u32 src)
+uword
+graph_del_node (graph_t * g, u32 src)
 {
-  graph_node_t * src_node, * n;
+  graph_node_t *src_node, *n;
   uword index;
-  graph_link_t * l;
+  graph_link_t *l;
 
   src_node = pool_elt_at_index (g->nodes, src);
 
   vec_foreach (l, src_node->next.links)
-    {
-      n = pool_elt_at_index (g->nodes, l->node_index);
-      graph_dir_del_link (&n->prev, src);
-    }
+  {
+    n = pool_elt_at_index (g->nodes, l->node_index);
+    graph_dir_del_link (&n->prev, src);
+  }
 
   vec_foreach (l, src_node->prev.links)
-    {
-      n = pool_elt_at_index (g->nodes, l->node_index);
-      graph_dir_del_link (&n->next, src);
-    }
+  {
+    n = pool_elt_at_index (g->nodes, l->node_index);
+    graph_dir_del_link (&n->next, src);
+  }
 
   graph_dir_free (&src_node->next);
   graph_dir_free (&src_node->prev);
@@ -104,36 +107,39 @@ uword graph_del_node (graph_t * g, u32 src)
   return index;
 }
 
-uword unformat_graph (unformat_input_t * input, va_list * args)
+uword
+unformat_graph (unformat_input_t * input, va_list * args)
 {
-  graph_t * g = va_arg (*args, graph_t *);
-  typedef struct {
+  graph_t *g = va_arg (*args, graph_t *);
+  typedef struct
+  {
     u32 src, dst, distance;
   } T;
-  T * links = 0, * l;
+  T *links = 0, *l;
   uword result;
 
   while (1)
     {
       vec_add2 (links, l, 1);
-      if (! unformat (input, "%d%d%d", &l->src, &l->dst, &l->distance))
+      if (!unformat (input, "%d%d%d", &l->src, &l->dst, &l->distance))
        break;
     }
   _vec_len (links) -= 1;
   result = vec_len (links) > 0;
   vec_foreach (l, links)
-    {
-      graph_set_link (g, l->src, l->dst, l->distance);
-      graph_set_link (g, l->dst, l->src, l->distance);
-    }
+  {
+    graph_set_link (g, l->src, l->dst, l->distance);
+    graph_set_link (g, l->dst, l->src, l->distance);
+  }
 
   vec_free (links);
   return result;
 }
 
-u8 * format_graph_node (u8 * s, va_list * args)
+u8 *
+format_graph_node (u8 * s, va_list * args)
 {
-  graph_t * g = va_arg (*args, graph_t *);
+  graph_t *g = va_arg (*args, graph_t *);
   u32 node_index = va_arg (*args, u32);
 
   if (g->format_node)
@@ -144,14 +150,16 @@ u8 * format_graph_node (u8 * s, va_list * args)
   return s;
 }
 
-u8 * format_graph (u8 * s, va_list * args)
+u8 *
+format_graph (u8 * s, va_list * args)
 {
-  graph_t * g = va_arg (*args, graph_t *);
-  graph_node_t * n;
-  graph_link_t * l;
+  graph_t *g = va_arg (*args, graph_t *);
+  graph_node_t *n;
+  graph_link_t *l;
   uword indent = format_get_indent (s);
 
   s = format (s, "graph %d nodes", pool_elts (g->nodes));
+  /* *INDENT-OFF* */
   pool_foreach (n, g->nodes, ({
     s = format (s, "\n%U", format_white_space, indent + 2);
     s = format (s, "%U -> ", format_graph_node, g, n - g->nodes);
@@ -160,6 +168,15 @@ u8 * format_graph (u8 * s, va_list * args)
                  format_graph_node, g, l->node_index,
                  l->distance);
   }));
+  /* *INDENT-ON* */
 
   return s;
 }
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */