diff options
Diffstat (limited to '')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/sllist.c | 73 | ||||
| -rw-r--r-- | src/sllist.h | 52 |
3 files changed, 0 insertions, 127 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 511ffac77..a4a519b40 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -62,7 +62,6 @@ mpd_headers = \ ringbuf.h \ signal_check.h \ sig_handlers.h \ - sllist.h \ song.h \ song_print.h \ song_save.h \ @@ -143,7 +142,6 @@ mpd_SOURCES = \ ringbuf.c \ sig_handlers.c \ signal_check.c \ - sllist.c \ song.c \ song_print.c \ song_save.c \ diff --git a/src/sllist.c b/src/sllist.c deleted file mode 100644 index b5239dc2a..000000000 --- a/src/sllist.c +++ /dev/null @@ -1,73 +0,0 @@ -/* the Music Player Daemon (MPD) - * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com) - * This project's homepage is: http://www.musicpd.org - * - * This program 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 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* a very simple singly-linked-list structure for queues/buffers */ - -#include "sllist.h" -#include "utils.h" - -#include <string.h> - -static void init_strnode(struct strnode *x, char *s) -{ - x->data = s; - x->next = NULL; -} - -struct strnode *new_strnode(char *s) -{ - struct strnode *x = xmalloc(sizeof(struct strnode)); - init_strnode(x, s); - return x; -} - -struct strnode *new_strnode_dup(const char *s, const size_t size) -{ - struct strnode *x = xmalloc(sizeof(struct strnode) + size); - x->next = NULL; - x->data = ((char *)x + sizeof(struct strnode)); - memcpy((void *)x->data, (const void*)s, size); - return x; -} - -struct sllnode *new_sllnode(const void *s, const size_t size) -{ - struct sllnode *x = xmalloc(sizeof(struct sllnode) + size); - x->next = NULL; - x->size = size; - x->data = ((char *)x + sizeof(struct sllnode)); - memcpy(x->data, (const void *)s, size); - return x; -} - -struct strnode *dup_strlist(struct strnode *old) -{ - struct strnode *tmp, *new, *cur; - - tmp = old; - cur = new = new_strnode_dup(tmp->data, strlen(tmp->data) + 1); - tmp = tmp->next; - while (tmp) { - cur->next = new_strnode_dup(tmp->data, strlen(tmp->data) + 1); - cur = cur->next; - tmp = tmp->next; - } - return new; -} - - diff --git a/src/sllist.h b/src/sllist.h deleted file mode 100644 index 5f9704a6a..000000000 --- a/src/sllist.h +++ /dev/null @@ -1,52 +0,0 @@ -/* the Music Player Daemon (MPD) - * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com) - * This project's homepage is: http://www.musicpd.org - * - * This program 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 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* a very simple singly-linked-list structure for queues/buffers */ - -#ifndef SLLIST_H -#define SLLIST_H - -#include <stddef.h> - -/* just free the entire structure if it's free-able, the 'data' member - * should _NEVER_ be explicitly freed - * - * there's no free command, iterate through them yourself and just - * call free() on it iff you xmalloc'd them */ - -struct strnode { - struct strnode *next; - char *data; -}; - -struct sllnode { - struct sllnode *next; - void *data; - size_t size; -}; - -struct strnode *new_strnode(char *s); - -struct strnode *new_strnode_dup(const char *s, const size_t size); - -struct strnode *dup_strlist(struct strnode *old); - -struct sllnode *new_sllnode(const void *s, const size_t size); - - -#endif /* SLLIST_H */ |