From 671419ebfb5a6fa0937fd410b0b419f39cf7b25d Mon Sep 17 00:00:00 2001 From: sabetts Date: Tue, 20 May 2003 07:20:14 +0000 Subject: * src/linkedlist.h: Move all C function to linkedlist.c * src/window.c (find_window): add debugging output describing which window list the window was found in. * src/group.c (group_new): assign the group's number the number passed as an argument. * src/events.c (destroy_window): withdraw iconified and normal windows before unmanaging them. (handle_signals): delete the node from the list before freeing it. * src/bar.h (message): remove define. (marked_wrapped_message): remove prototype (message): new prototype * src/bar.c (message): new function (marked_wrapped_message): renamed to marked_message. remove marked_message. --- src/linkedlist.h | 163 +++++++------------------------------------------------ 1 file changed, 21 insertions(+), 142 deletions(-) (limited to 'src/linkedlist.h') diff --git a/src/linkedlist.h b/src/linkedlist.h index d36f07f..e9181ee 100644 --- a/src/linkedlist.h +++ b/src/linkedlist.h @@ -5,8 +5,6 @@ #ifndef _RATPOISON_LINKLIST_H #define _RATPOISON_LINKLIST_H -static inline void prefetch(const void *x) {;} - /* * Simple doubly linked list implementation. * @@ -30,154 +28,35 @@ struct list_head { (ptr)->next = (ptr); (ptr)->prev = (ptr); \ } while (0) -/* - * Insert a new entry between two known consecutive entries. - * - * This is only for internal list manipulation where we know - * the prev/next entries already! - */ -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; -} +/* Prototypes of C functions. */ +void list_splice_init(struct list_head *list, + struct list_head *head); -/** - * list_add - add a new entry - * @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) -{ - __list_add(new, head, head->next); -} +void list_splice_init(struct list_head *list, + struct list_head *head); -/** - * list_add_tail - add a new entry - * @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) -{ - __list_add(new, head->prev, head); -} +void list_splice(struct list_head *list, struct list_head *head); -/* - * Delete a list entry by making the prev/next entries - * point to each other. - * - * This is only for internal list manipulation where we know - * the prev/next entries already! - */ -static inline void __list_del(struct list_head * prev, struct list_head * next) -{ - next->prev = prev; - prev->next = next; -} +void __list_splice(struct list_head *list, + struct list_head *head); -/** - * list_del - deletes entry from list. - * @entry: the element to delete from the list. - * Note: list_empty on entry does not return true after this, the entry is - * in an undefined state. - */ -static inline void list_del(struct list_head *entry) -{ - __list_del(entry->prev, entry->next); -} +int list_empty(struct list_head *head); -/** - * list_del_init - deletes entry from list and reinitialize it. - * @entry: the element to delete from the list. - */ -static inline void list_del_init(struct list_head *entry) -{ - __list_del(entry->prev, entry->next); - INIT_LIST_HEAD(entry); -} +void list_move_tail(struct list_head *list, + struct list_head *head); -/** - * list_move - delete from one list and add as another's head - * @list: the entry to move - * @head: the head that will precede our entry - */ -static inline void list_move(struct list_head *list, struct list_head *head) -{ - __list_del(list->prev, list->next); - list_add(list, head); -} - -/** - * list_move_tail - delete from one list and add as another's tail - * @list: the entry to move - * @head: the head that will follow our entry - */ -static inline void list_move_tail(struct list_head *list, - struct list_head *head) -{ - __list_del(list->prev, list->next); - list_add_tail(list, head); -} - -/** - * list_empty - tests whether a list is empty - * @head: the list to test. - */ -static inline int list_empty(struct list_head *head) -{ - return head->next == head; -} +void list_move(struct list_head *list, struct list_head *head); -static inline void __list_splice(struct list_head *list, - struct list_head *head) -{ - struct list_head *first = list->next; - struct list_head *last = list->prev; - struct list_head *at = head->next; +void list_del_init(struct list_head *entry); +void list_del(struct list_head *entry); +void __list_del(struct list_head * prev, struct list_head * next); +void list_add_tail(struct list_head *new, struct list_head *head); +void list_add(struct list_head *new, struct list_head *head); +void __list_add(struct list_head *new, + struct list_head *prev, + struct list_head *next); +void prefetch(const void *x); - first->prev = head; - head->next = first; - - last->next = at; - at->prev = last; -} - -/** - * list_splice - join two lists - * @list: the new list to add. - * @head: the place to add it in the first list. - */ -static inline void list_splice(struct list_head *list, struct list_head *head) -{ - if (!list_empty(list)) - __list_splice(list, head); -} - -/** - * list_splice_init - join two lists and reinitialise the emptied list. - * @list: the new list to add. - * @head: the place to add it in the first list. - * - * The list at @list is reinitialised - */ -static inline void list_splice_init(struct list_head *list, - struct list_head *head) -{ - if (!list_empty(list)) { - __list_splice(list, head); - INIT_LIST_HEAD(list); - } -} /** * container_of - cast a member of a structure out to the containing structure -- cgit v1.2.3