aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAvuton Olrich <avuton@gmail.com>2006-07-14 19:13:51 +0000
committerAvuton Olrich <avuton@gmail.com>2006-07-14 19:13:51 +0000
commit7154c510e56be26a7d79a4d60a45ad6c60d2659c (patch)
treecd6d78ef8b31fca63ea4d0653e384ece4f74bff3 /src
parent75789d1490469eb89dab2093a982480b5bd6143f (diff)
downloadmpd-7154c510e56be26a7d79a4d60a45ad6c60d2659c.tar.gz
mpd-7154c510e56be26a7d79a4d60a45ad6c60d2659c.tar.xz
mpd-7154c510e56be26a7d79a4d60a45ad6c60d2659c.zip
[CLEANUP] Remove unused code
Static what makes sense git-svn-id: https://svn.musicpd.org/mpd/trunk@4329 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/list.c69
-rw-r--r--src/list.h5
2 files changed, 8 insertions, 66 deletions
diff --git a/src/list.c b/src/list.c
index 4aeecf071..4a5f4f712 100644
--- a/src/list.c
+++ b/src/list.c
@@ -25,7 +25,7 @@
#include <time.h>
#include <stdio.h>
-void makeListNodesArray(List * list) {
+static void makeListNodesArray(List * list) {
ListNode * node = list->firstNode;
long i;
@@ -40,7 +40,7 @@ void makeListNodesArray(List * list) {
}
}
-void freeListNodesArray(List * list) {
+static void freeListNodesArray(List * list) {
if(!list->nodesArray) return;
free(list->nodesArray);
list->nodesArray = NULL;
@@ -193,7 +193,9 @@ int insertInListWithoutKey(List * list, void * data) {
return 1;
}
-int findNodeInList(List * list, char * key, ListNode ** node, int * pos) {
+/* if _key_ is not found, *_node_ is assigned to the node before which
+ the info would be found */
+static int findNodeInList(List * list, char * key, ListNode ** node, int * pos) {
long high;
long low;
long cur;
@@ -342,32 +344,7 @@ void freeList(void * list) {
free(list);
}
-void clearList(List * list) {
- ListNode * tmpNode;
- ListNode * tmpNode2;
-
- assert(list!=NULL);
-
- tmpNode = ((List *)list)->firstNode;
-
- while(tmpNode!=NULL) {
- tmpNode2 = tmpNode->nextNode;
- if(list->strdupKeys) free(tmpNode->key);
- if(((List *)list)->freeDataFunc) {
- ((List *)list)->freeDataFunc(tmpNode->data);
- }
- free(tmpNode);
- tmpNode = tmpNode2;
- }
-
- if(list->nodesArray) freeListNodesArray(list);
-
- list->firstNode = NULL;
- list->lastNode = NULL;
- list->numberOfNodes = 0;
-}
-
-void swapNodes(ListNode * nodeA, ListNode * nodeB) {
+static void swapNodes(ListNode * nodeA, ListNode * nodeB) {
char * key;
void * data;
@@ -384,37 +361,7 @@ void swapNodes(ListNode * nodeA, ListNode * nodeB) {
nodeA->data = data;
}
-void moveNodeAfter(List * list, ListNode * moveNode, ListNode * beforeNode) {
- ListNode * prev;
- ListNode * next;
-
- assert(moveNode!=NULL);
-
- prev = moveNode->prevNode;
- next = moveNode->nextNode;
-
- if(prev) prev->nextNode = next;
- else list->firstNode = next;
- if(next) next->prevNode = prev;
- else list->lastNode = prev;
-
- if(beforeNode) {
- next = beforeNode->nextNode;
- moveNode->nextNode = next;
- moveNode->prevNode = beforeNode;
- next->prevNode = moveNode;
- beforeNode->nextNode = moveNode;
- if(beforeNode==list->lastNode) list->lastNode = moveNode;
- }
- else {
- moveNode->prevNode = NULL;
- moveNode->nextNode = list->firstNode;
- list->firstNode = moveNode;
- if(list->lastNode==NULL) list->lastNode = moveNode;
- }
-}
-
-void bubbleSort(ListNode ** nodesArray, long start, long end) {
+static void bubbleSort(ListNode ** nodesArray, long start, long end) {
long i;
long j;
ListNode * node;
@@ -431,7 +378,7 @@ void bubbleSort(ListNode ** nodesArray, long start, long end) {
}
}
-void quickSort(ListNode ** nodesArray, long start, long end) {
+static void quickSort(ListNode ** nodesArray, long start, long end) {
if(start>=end) return;
else if(end-start<5) bubbleSort(nodesArray,start,end);
else {
diff --git a/src/list.h b/src/list.h
index 00568a427..3730adf5e 100644
--- a/src/list.h
+++ b/src/list.h
@@ -97,17 +97,12 @@ void deleteNodeFromList(List * list,ListNode * node);
*/
int findInList(List * list, char * key, void ** data);
-/* if _key_ is not found, *_node_ is assigned to the node before which
- the info would be found */
-int findNodeInList(List * list, char * key, ListNode ** node, int * pos);
/* frees memory malloc'd for list and its nodes
* _list_ -> List to be free'd
*/
void freeList(void * list);
-void clearList(List * list);
-
void sortList(List * list);
#endif