list.h: Don't use "new" as an variable name.

[paraslash.git] / list.h

diff --git a/list.h b/list.h
index f4064470b6beb69eca1a37ebd588b04a5aa7fdc4..da66e6bd815e0e49032fbfa21c859d24bb314d86 100644 (file)
--- a/list.h
+++ b/list.h
@@ -32,46 +32,35 @@ struct list_head {
 /**
  * Insert a new entry after the specified head.
  *
- * \param new The new entry to add.
+ * \param entry The new entry to add.
  * \param head The list head to add it after.
  *
  * This is good for implementing stacks.
  */
-static inline void para_list_add(struct list_head *new, struct list_head *head)
+static inline void para_list_add(struct list_head *entry, struct list_head *head)
 {
-       new->prev = head;
-       new->next = head->next;
-       head->next->prev = new;
-       head->next = new;
+       entry->prev = head;
+       entry->next = head->next;
+       head->next->prev = entry;
+       head->next = entry;
 }
 
 /**
  * Insert a new entry before the specified head.
  *
- * \param new The new entry to add.
+ * \param entry The new entry to add.
  * \param head list head to add it before.
  *
  * This is useful for implementing queues.
  */
-static inline void list_add_tail(struct list_head *new, struct list_head *head)
+static inline void list_add_tail(struct list_head *entry, struct list_head *head)
 {
-       new->prev = head->prev;
-       new->next = head;
-       head->prev->next = new;
-       head->prev = new;
+       entry->prev = head->prev;
+       entry->next = head;
+       head->prev->next = entry;
+       head->prev = entry;
 }
 
-/*
- * These non-NULL pointers result in page faults when dereferenced. This helps
- * to catch bugs resulting from using deleted list heads.
- */
-
-/** Used for poisoning the next pointer. */
-#define LIST_POISON1 ((void *)0x00100100)
-
-/** Used for poisoning the prev pointer. */
-#define LIST_POISON2 ((void *)0x00200200)
-
 /**
  * Delete an entry from a list.
  *
@@ -84,8 +73,12 @@ static inline void list_del(struct list_head *entry)
 {
        entry->prev->next = entry->next;
        entry->next->prev = entry->prev;
-       entry->next = LIST_POISON1;
-       entry->prev = LIST_POISON2;
+       /*
+        * These non-NULL pointers result in page faults when dereferenced.
+        * This helps to catch bugs resulting from using deleted list heads.
+        */
+       entry->next = (void *)0x00100100;
+       entry->prev = (void *)0x00200200;
 }
 
 /**