VPP-327 Coding standards cleanup for vppinfra

[vpp.git] / vppinfra / vppinfra / slist.h

diff --git a/vppinfra/vppinfra/slist.h b/vppinfra/vppinfra/slist.h
index 1405aff..a7c77e2 100644 (file)
--- a/vppinfra/vppinfra/slist.h
+++ b/vppinfra/vppinfra/slist.h
@@ -26,16 +26,19 @@
 #include <vppinfra/cache.h>
 
 typedef word (clib_slist_key_compare_function_t)
-(void *key, u32 elt_pool_index);
+  (void *key, u32 elt_pool_index);
 
-typedef enum {
+typedef enum
+{
   CLIB_SLIST_MATCH = 0,
   CLIB_SLIST_NO_MATCH
 } clib_slist_search_result_t;
 
-typedef struct {
+typedef struct
+{
   /* Vector of next elements. Every valid instance has at least one */
-  union {
+  union
+  {
     u32 next0[2];
     u32 *nexts;
   } n;
@@ -45,45 +48,45 @@ typedef struct {
   /* $$$ pad to even divisor of cache line */
 } clib_slist_elt_t;
 
-static inline u32 clib_slist_get_next_at_level (clib_slist_elt_t * elt, 
-                                                int level)
+static inline u32
+clib_slist_get_next_at_level (clib_slist_elt_t * elt, int level)
 {
   if (elt->n.next0[0] & 1)
     {
       ASSERT (level < 2);
       if (level == 1)
-        return elt->n.next0[1];
+       return elt->n.next0[1];
       /* preserve ~0 (end of list) */
-      return (elt->n.next0[0] == (u32)~0) ? elt->n.next0[0] :
-        (elt->n.next0[0]>>1);
+      return (elt->n.next0[0] == (u32) ~ 0) ? elt->n.next0[0] :
+       (elt->n.next0[0] >> 1);
     }
   else
     {
-      ASSERT(level < vec_len (elt->n.nexts));
+      ASSERT (level < vec_len (elt->n.nexts));
       return elt->n.nexts[level];
     }
 }
 
-static inline void clib_slist_set_next_at_level (clib_slist_elt_t * elt,
-                                                 u32 index, int level)
+static inline void
+clib_slist_set_next_at_level (clib_slist_elt_t * elt, u32 index, int level)
 {
   u32 old_level0_value[2];
   /* level0 and not a vector */
   if (level < 2 && (elt->n.next0[0] == 0 || elt->n.next0[0] & 1))
     {
       if (level == 0)
-        {
-          elt->n.next0[0] = (index<<1) | 1;
-          return;
-        }
+       {
+         elt->n.next0[0] = (index << 1) | 1;
+         return;
+       }
       elt->n.next0[1] = index;
       return;
     }
   /* have to save old level0 values? */
   if (elt->n.next0[0] & 1)
     {
-      old_level0_value[0] = (elt->n.next0[0] == (u32)~0) ? 
-        elt->n.next0[0] : elt->n.next0[0]>>1;
+      old_level0_value[0] = (elt->n.next0[0] == (u32) ~ 0) ?
+       elt->n.next0[0] : elt->n.next0[0] >> 1;
       old_level0_value[1] = elt->n.next0[1];
       elt->n.nexts = 0;
       vec_add1 (elt->n.nexts, old_level0_value[0]);
@@ -94,7 +97,8 @@ static inline void clib_slist_set_next_at_level (clib_slist_elt_t * elt,
 }
 
 
-typedef struct {
+typedef struct
+{
   /* pool of skip-list elements */
   clib_slist_elt_t *elts;
 
@@ -120,16 +124,22 @@ typedef struct {
   u32 seed;
 } clib_slist_t;
 
-clib_error_t *
-clib_slist_init (clib_slist_t *sp, f64 branching_factor, 
-                 clib_slist_key_compare_function_t compare,
-                 format_function_t format_user_element);
+clib_error_t *clib_slist_init (clib_slist_t * sp, f64 branching_factor,
+                              clib_slist_key_compare_function_t compare,
+                              format_function_t format_user_element);
 
 format_function_t format_slist;
 
-void clib_slist_add (clib_slist_t *sp, void *key, u32 user_pool_index);
-clib_slist_search_result_t 
-clib_slist_del (clib_slist_t *sp, void *key);
-u32 clib_slist_search (clib_slist_t *sp, void *key, u32 *ncompares);
+void clib_slist_add (clib_slist_t * sp, void *key, u32 user_pool_index);
+clib_slist_search_result_t clib_slist_del (clib_slist_t * sp, void *key);
+u32 clib_slist_search (clib_slist_t * sp, void *key, u32 * ncompares);
 
 #endif /* included_slist_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */