diff --git a/wmbiff/wmgeneral/Makefile.am b/wmbiff/wmgeneral/Makefile.am index 3e15428..ed65c43 100644 --- a/wmbiff/wmgeneral/Makefile.am +++ b/wmbiff/wmgeneral/Makefile.am @@ -1,5 +1,5 @@ noinst_LIBRARIES = libwmgeneral.a -libwmgeneral_a_SOURCES = list.c list.h misc.c misc.h wmgeneral.c wmgeneral.h +libwmgeneral_a_SOURCES = misc.c misc.h wmgeneral.c wmgeneral.h MAINTAINERCLEANFILES = Makefile.in diff --git a/wmbiff/wmgeneral/list.c b/wmbiff/wmgeneral/list.c deleted file mode 100644 index b4d0685..0000000 --- a/wmbiff/wmgeneral/list.c +++ /dev/null @@ -1,155 +0,0 @@ -/* Generic single linked list to keep various information - Copyright (C) 1993, 1994 Free Software Foundation, Inc. - - -Author: Kresten Krab Thorup - -Many modifications by Alfredo K. Kojima - - -This file is part of GNU CC. - -GNU CC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU CC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301 USA. */ - -/* As a special exception, if you link this library with files compiled with - GCC to produce an executable, this does not cause the resulting executable - to be covered by the GNU General Public License. This exception does not - however invalidate any other reasons why the executable file might be - covered by the GNU General Public License. */ - -#include "list.h" -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#include - -/* Return a cons cell produced from (head . tail) */ - -INLINE LinkedList *list_cons(void *head, LinkedList * tail) -{ - LinkedList *cell; - - cell = (LinkedList *) malloc(sizeof(LinkedList)); - cell->head = head; - cell->tail = tail; - return cell; -} - -/* Return the length of a list, list_length(NULL) returns zero */ - -INLINE int list_length(LinkedList * list) -{ - int i = 0; - while (list) { - i += 1; - list = list->tail; - } - return i; -} - -/* Return the Nth element of LIST, where N count from zero. If N - larger than the list length, NULL is returned */ - -INLINE void *list_nth(int idx, LinkedList * list) -{ - while (idx-- != 0) { - if (list->tail) - list = list->tail; - else - return 0; - } - return list->head; -} - -/* Remove the element at the head by replacing it by its successor */ - -INLINE void list_remove_head(LinkedList ** list) -{ - if (!*list) - return; - if ((*list)->tail) { - LinkedList *tail = (*list)->tail; /* fetch next */ - *(*list) = *tail; /* copy next to list head */ - free(tail); /* free next */ - } else { /* only one element in list */ - - free(*list); - (*list) = 0; - } -} - - -/* Remove the element with `car' set to ELEMENT */ -/* -INLINE void -list_remove_elem(LinkedList** list, void* elem) -{ - while (*list) - { - if ((*list)->head == elem) - list_remove_head(list); - *list = (*list ? (*list)->tail : NULL); - } -}*/ - -INLINE LinkedList *list_remove_elem(LinkedList * list, void *elem) -{ - LinkedList *tmp; - - if (list) { - if (list->head == elem) { - tmp = list->tail; - free(list); - return tmp; - } - list->tail = list_remove_elem(list->tail, elem); - return list; - } - return NULL; -} - - -/* Return element that has ELEM as car */ - -INLINE LinkedList *list_find(LinkedList * list, void *elem) -{ - while (list) { - if (list->head == elem) - return list; - list = list->tail; - } - return NULL; -} - -/* Free list (backwards recursive) */ - -INLINE void list_free(LinkedList * list) -{ - if (list) { - list_free(list->tail); - free(list); - } -} - -/* Map FUNCTION over all elements in LIST */ - -INLINE void list_mapcar(LinkedList * list, void (*function) (void *)) -{ - while (list) { - (*function) (list->head); - list = list->tail; - } -} diff --git a/wmbiff/wmgeneral/list.h b/wmbiff/wmgeneral/list.h deleted file mode 100644 index c189208..0000000 --- a/wmbiff/wmgeneral/list.h +++ /dev/null @@ -1,59 +0,0 @@ -/* Generic single linked list to keep various information - Copyright (C) 1993, 1994 Free Software Foundation, Inc. - -Author: Kresten Krab Thorup - -This file is part of GNU CC. - -GNU CC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU CC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301 USA. */ - -/* As a special exception, if you link this library with files compiled with - GCC to produce an executable, this does not cause the resulting executable - to be covered by the GNU General Public License. This exception does not - however invalidate any other reasons why the executable file might be - covered by the GNU General Public License. */ - -#ifndef __LIST_H_ -#define __LIST_H_ - -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -# define INLINE inline -#else -# define INLINE -#endif - -typedef struct LinkedList { - void *head; - struct LinkedList *tail; -} LinkedList; - -INLINE LinkedList *list_cons(void *head, LinkedList * tail); - -INLINE int list_length(LinkedList * list); - -INLINE void *list_nth(int n, LinkedList * list); - -INLINE void list_remove_head(LinkedList ** list); - -INLINE LinkedList *list_remove_elem(LinkedList * list, void *elem); - -INLINE void list_mapcar(LinkedList * list, void (*function) (void *)); - -INLINE LinkedList *list_find(LinkedList * list, void *elem); - -INLINE void list_free(LinkedList * list); - -#endif diff --git a/wmbiff/wmgeneral/misc.c b/wmbiff/wmgeneral/misc.c index afb6b77..0b56b4b 100644 --- a/wmbiff/wmgeneral/misc.c +++ b/wmbiff/wmgeneral/misc.c @@ -21,7 +21,6 @@ #include #include -#include "list.h" #include "misc.h" extern pid_t execCommand(const char *command)