From: Felix Fietkau Date: Thu, 27 Oct 2011 08:15:01 +0000 (+0200) Subject: list.h: rename parameter named "new" to "_new" to avoid using a reserved C++ keyword... X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=commitdiff_plain;h=01c6f73ed76ade6f05496f16d682699c02cb1eec list.h: rename parameter named "new" to "_new" to avoid using a reserved C++ keyword (patch by Arthur Davis) --- diff --git a/list.h b/list.h index 10dd4dc..76909c5 100644 --- a/list.h +++ b/list.h @@ -46,41 +46,41 @@ static inline void INIT_LIST_HEAD(struct list_head *list) * This is only for internal list manipulation where we know * the prev/next entries already! */ -static inline void __list_add(struct list_head *new, +static inline void __list_add(struct list_head *_new, struct list_head *prev, struct list_head *next) { - next->prev = new; - new->next = next; - new->prev = prev; - prev->next = new; + next->prev = _new; + _new->next = next; + _new->prev = prev; + prev->next = _new; } /** * list_add - add a new entry - * @new: new entry to be added + * @_new: new entry to be added * @head: list head to add it after * * Insert a new entry after the specified head. * This is good for implementing stacks. */ -static inline void list_add(struct list_head *new, struct list_head *head) +static inline void list_add(struct list_head *_new, struct list_head *head) { - __list_add(new, head, head->next); + __list_add(_new, head, head->next); } /** * list_add_tail - add a new entry - * @new: new entry to be added + * @_new: new entry to be added * @head: list head to add it before * * Insert a new entry before the specified head. * 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 *_new, struct list_head *head) { - __list_add(new, head->prev, head); + __list_add(_new, head->prev, head); } @@ -113,23 +113,23 @@ static inline void list_del(struct list_head *entry) /** * list_replace - replace old entry by new one * @old : the element to be replaced - * @new : the new element to insert + * @_new : the new element to insert * * If @old was empty, it will be overwritten. */ static inline void list_replace(struct list_head *old, - struct list_head *new) + struct list_head *_new) { - new->next = old->next; - new->next->prev = new; - new->prev = old->prev; - new->prev->next = new; + _new->next = old->next; + _new->next->prev = _new; + _new->prev = old->prev; + _new->prev->next = _new; } static inline void list_replace_init(struct list_head *old, - struct list_head *new) + struct list_head *_new) { - list_replace(old, new); + list_replace(old, _new); INIT_LIST_HEAD(old); }