VPP-246 Coding standards cleanup - vnet/vnet/classify

Signed-off-by: khemendra kumar <khemendra.kumar13@gmail.com>
Change-Id: I0d94ef604d34da6981e7c2d2b4da5ec3ec5fb19a

1 files changed, 69 insertions, 51 deletions

diff --git a/src/vnet/classify/policer_classify.c b/src/vnet/classify/policer_classify.c
index 2a4fa62c023..542ba1015ed 100644
--- a/src/vnet/classify/policer_classify.c
+++ b/src/vnet/classify/policer_classify.c
@@ -18,19 +18,19 @@ policer_classify_main_t policer_classify_main;
 
 static void
 vnet_policer_classify_feature_enable (vlib_main_t * vnm,
-                                      policer_classify_main_t * pcm,
-                                      u32 sw_if_index,
-                                      policer_classify_table_id_t tid,
-                                      int feature_enable)
+				      policer_classify_main_t * pcm,
+				      u32 sw_if_index,
+				      policer_classify_table_id_t tid,
+				      int feature_enable)
 {
   if (tid == POLICER_CLASSIFY_TABLE_L2)
     {
       l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_POLICER_CLAS,
-                                  feature_enable);
+				  feature_enable);
     }
   else
     {
-      vnet_feature_config_main_t * fcm;
+      vnet_feature_config_main_t *fcm;
       u8 arc;
 
       if (tid == POLICER_CLASSIFY_TABLE_IP4)
@@ -39,7 +39,7 @@ vnet_policer_classify_feature_enable (vlib_main_t * vnm,
 				       sw_if_index, feature_enable, 0, 0);
 	  arc = vnet_get_feature_arc_index ("ip4-unicast");
 	}
-      
+
       else
 	{
 	  vnet_feature_enable_disable ("ip6-unicast", "ip6-policer-classify",
@@ -52,14 +52,16 @@ vnet_policer_classify_feature_enable (vlib_main_t * vnm,
     }
 }
 
-int vnet_set_policer_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
-                                     u32 ip4_table_index, u32 ip6_table_index,
-                                     u32 l2_table_index, u32 is_add)
+int
+vnet_set_policer_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
+				 u32 ip4_table_index, u32 ip6_table_index,
+				 u32 l2_table_index, u32 is_add)
 {
-  policer_classify_main_t * pcm = &policer_classify_main;
-  vnet_classify_main_t * vcm = pcm->vnet_classify_main;
-  u32 pct[POLICER_CLASSIFY_N_TABLES] = {ip4_table_index, ip6_table_index,
-                                        l2_table_index};
+  policer_classify_main_t *pcm = &policer_classify_main;
+  vnet_classify_main_t *vcm = pcm->vnet_classify_main;
+  u32 pct[POLICER_CLASSIFY_N_TABLES] = { ip4_table_index, ip6_table_index,
+    l2_table_index
+  };
   u32 ti;
 
   /* Assume that we've validated sw_if_index in the API layer */
@@ -67,34 +69,36 @@ int vnet_set_policer_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
   for (ti = 0; ti < POLICER_CLASSIFY_N_TABLES; ti++)
     {
       if (pct[ti] == ~0)
-        continue;
+	continue;
 
       if (pool_is_free_index (vcm->tables, pct[ti]))
-        return VNET_API_ERROR_NO_SUCH_TABLE;
+	return VNET_API_ERROR_NO_SUCH_TABLE;
 
       vec_validate_init_empty
-        (pcm->classify_table_index_by_sw_if_index[ti], sw_if_index, ~0);
+	(pcm->classify_table_index_by_sw_if_index[ti], sw_if_index, ~0);
 
       /* Reject any DEL operation with wrong sw_if_index */
       if (!is_add &&
-          (pct[ti] != pcm->classify_table_index_by_sw_if_index[ti][sw_if_index]))
-        {
-          clib_warning ("Non-existent intf_idx=%d with table_index=%d for delete",
-                        sw_if_index, pct[ti]);
-          return VNET_API_ERROR_NO_SUCH_TABLE;
-        }
+	  (pct[ti] !=
+	   pcm->classify_table_index_by_sw_if_index[ti][sw_if_index]))
+	{
+	  clib_warning
+	    ("Non-existent intf_idx=%d with table_index=%d for delete",
+	     sw_if_index, pct[ti]);
+	  return VNET_API_ERROR_NO_SUCH_TABLE;
+	}
 
       /* Return ok on ADD operaton if feature is already enabled */
       if (is_add &&
-          pcm->classify_table_index_by_sw_if_index[ti][sw_if_index] != ~0)
-          return 0;
+	  pcm->classify_table_index_by_sw_if_index[ti][sw_if_index] != ~0)
+	return 0;
 
       vnet_policer_classify_feature_enable (vm, pcm, sw_if_index, ti, is_add);
 
       if (is_add)
-        pcm->classify_table_index_by_sw_if_index[ti][sw_if_index] = pct[ti];
+	pcm->classify_table_index_by_sw_if_index[ti][sw_if_index] = pct[ti];
       else
-        pcm->classify_table_index_by_sw_if_index[ti][sw_if_index] = ~0;
+	pcm->classify_table_index_by_sw_if_index[ti][sw_if_index] = ~0;
     }
 
 
@@ -103,10 +107,10 @@ int vnet_set_policer_classify_intfc (vlib_main_t * vm, u32 sw_if_index,
 
 static clib_error_t *
 set_policer_classify_command_fn (vlib_main_t * vm,
-                                 unformat_input_t * input,
-                                 vlib_cli_command_t * cmd)
+				 unformat_input_t * input,
+				 vlib_cli_command_t * cmd)
 {
-  vnet_main_t * vnm = vnet_get_main();
+  vnet_main_t *vnm = vnet_get_main ();
   u32 sw_if_index = ~0;
   u32 ip4_table_index = ~0;
   u32 ip6_table_index = ~0;
@@ -118,18 +122,18 @@ set_policer_classify_command_fn (vlib_main_t * vm,
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {
       if (unformat (input, "interface %U", unformat_vnet_sw_interface,
-                    vnm, &sw_if_index))
-        ;
+		    vnm, &sw_if_index))
+	;
       else if (unformat (input, "ip4-table %d", &ip4_table_index))
-        idx_cnt++;
+	idx_cnt++;
       else if (unformat (input, "ip6-table %d", &ip6_table_index))
-        idx_cnt++;
+	idx_cnt++;
       else if (unformat (input, "l2-table %d", &l2_table_index))
-        idx_cnt++;
+	idx_cnt++;
       else if (unformat (input, "del"))
-        is_add = 0;
+	is_add = 0;
       else
-        break;
+	break;
     }
 
   if (sw_if_index == ~0)
@@ -141,8 +145,9 @@ set_policer_classify_command_fn (vlib_main_t * vm,
   if (idx_cnt > 1)
     return clib_error_return (0, "Only one table index per API is allowed.");
 
-  rv = vnet_set_policer_classify_intfc(vm, sw_if_index, ip4_table_index,
-                                       ip6_table_index, l2_table_index, is_add);
+  rv = vnet_set_policer_classify_intfc (vm, sw_if_index, ip4_table_index,
+					ip6_table_index, l2_table_index,
+					is_add);
 
   switch (rv)
     {
@@ -158,6 +163,7 @@ set_policer_classify_command_fn (vlib_main_t * vm,
   return 0;
 }
 
+/* *INDENT-OFF* */
 VLIB_CLI_COMMAND (set_policer_classify_command, static) = {
     .path = "set policer classify",
     .short_help =
@@ -165,11 +171,12 @@ VLIB_CLI_COMMAND (set_policer_classify_command, static) = {
     "  [ip6-table <index>] [l2-table <index>] [del]",
     .function = set_policer_classify_command_fn,
 };
+/* *INDENT-ON* */
 
 static uword
 unformat_table_type (unformat_input_t * input, va_list * va)
 {
-  u32 * r = va_arg (*va, u32 *);
+  u32 *r = va_arg (*va, u32 *);
   u32 tid;
 
   if (unformat (input, "ip4"))
@@ -184,14 +191,15 @@ unformat_table_type (unformat_input_t * input, va_list * va)
   *r = tid;
   return 1;
 }
+
 static clib_error_t *
 show_policer_classify_command_fn (vlib_main_t * vm,
-                                  unformat_input_t * input,
-                                  vlib_cli_command_t * cmd)
+				  unformat_input_t * input,
+				  vlib_cli_command_t * cmd)
 {
-  policer_classify_main_t * pcm = &policer_classify_main;
+  policer_classify_main_t *pcm = &policer_classify_main;
   u32 type = POLICER_CLASSIFY_N_TABLES;
-  u32 * vec_tbl;
+  u32 *vec_tbl;
   int i;
 
   if (unformat (input, "type %U", unformat_table_type, &type))
@@ -204,26 +212,36 @@ show_policer_classify_command_fn (vlib_main_t * vm,
 
   vec_tbl = pcm->classify_table_index_by_sw_if_index[type];
 
-  if (vec_len(vec_tbl))
-      vlib_cli_output (vm, "%10s%20s\t\t%s", "Intfc idx", "Classify table",
-                       "Interface name");
+  if (vec_len (vec_tbl))
+    vlib_cli_output (vm, "%10s%20s\t\t%s", "Intfc idx", "Classify table",
+		     "Interface name");
   else
     vlib_cli_output (vm, "No tables configured.");
 
   for (i = 0; i < vec_len (vec_tbl); i++)
     {
-      if (vec_elt(vec_tbl, i) == ~0)
-        continue;
+      if (vec_elt (vec_tbl, i) == ~0)
+	continue;
 
-      vlib_cli_output (vm, "%10d%20d\t\t%U", i, vec_elt(vec_tbl, i),
-                       format_vnet_sw_if_index_name, pcm->vnet_main, i);
+      vlib_cli_output (vm, "%10d%20d\t\t%U", i, vec_elt (vec_tbl, i),
+		       format_vnet_sw_if_index_name, pcm->vnet_main, i);
     }
 
   return 0;
 }
 
+/* *INDENT-OFF* */
 VLIB_CLI_COMMAND (show_policer_classify_command, static) = {
     .path = "show classify policer",
     .short_help = "show classify policer type [ip4|ip6|l2]",
     .function = show_policer_classify_command_fn,
 };
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */