Changeset 205832b in mainline for kernel/generic/src/adt/cht.c

Timestamp:

2012-11-05T15:37:39Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f048658

Parents:

6b99156

Message:

Replaced 0 with NULL where appropriate (in rcu, cht, uspace hashtable, smp_call, workqueue).

File:

• kernel/generic/src/adt/cht.c (modified) (16 diffs)

kernel/generic/src/adt/cht.c

@@ -151 +151 @@
 /* Sentinel node used by all buckets. Stores the greatest possible hash value.*/
 static const cht_link_t sentinel = {
-        .link = 0,
+        /* NULL and N_NORMAL */
+        .link = 0 | N_NORMAL,
         .hash = -1
 };
@@ -265 +266 @@
         h->max_load = (max_load == 0) ? CHT_MAX_LOAD : max_load;
         h->min_order = min_order;
-        h->new_b = 0;
+        h->new_b = NULL;
         h->op = op;
         atomic_set(&h->item_cnt, 0);
@@ -298 +299 @@
         
         if (!b)
-                return 0;
+                return NULL;
         
         b->order = order;
@@ -346 +347 @@
         
         free(h->b);
-        h->b = 0;
+        h->b = NULL;
         
         /* You must clear the table of items. Otherwise cht_destroy will leak. */
@@ -457 +458 @@
          */
 
-        cht_link_t *cur = 0;
+        cht_link_t *cur = NULL;
         marked_ptr_t prev = head;
 
@@ -492 +493 @@
         }
         
-        return 0;
+        return NULL;
 }
 
@@ -607 +608 @@
                          * points to an allocated join node (if non-null) even if marked 
                          * invalid. Before the resizer lets join nodes to be unlinked
-                         * (and freed) it sets old_head to 0 and waits for a grace period.
+                         * (and freed) it sets old_head to NULL and waits for a grace period.
                          * So either the invalid old_head points to join node; or old_head
                          * is null and we would have seen a completed bucket join while
@@ -616 +617 @@
                 }
                 
-                return 0;
+                return NULL;
         } else {
                 /* 
@@ -700 +701 @@
                         .ppred = phead,
                         .cur = get_next(*phead),
-                        .last = 0
+                        .last = NULL
                 };
                 
@@ -807 +808 @@
          */
         read_barrier();
-        return 0 != find_duplicate(h, item, hash, wnd->cur);
+        return NULL != find_duplicate(h, item, hash, wnd->cur);
 }
 
@@ -840 +841 @@
         }
         
-        return 0;       
+        return NULL;
 }
 
@@ -908 +909 @@
                         .ppred = phead,
                         .cur = get_next(*phead),
-                        .last = 0
+                        .last = NULL
                 };
                 
@@ -1194 +1195 @@
         }
 
-        /* wnd->cur may be 0 or even marked N_DELETED. */
+        /* wnd->cur may be NULL or even marked N_DELETED. */
         return true;
 }
@@ -1966 +1967 @@
         
         /* Not needed; just for increased readability. */
-        h->new_b = 0;
+        h->new_b = NULL;
 }
 
@@ -2065 +2066 @@
         
         /* Not needed; just for increased readability. */
-        h->new_b = 0;
+        h->new_b = NULL;
 }
 
@@ -2144 +2145 @@
 
         wnd_t wnd = {
-                .ppred = 0,
-                .cur = 0
+                .ppred = NULL,
+                .cur = NULL
         };
         marked_ptr_t *cur_link = new_head;