aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvuton Olrich <avuton@gmail.com>2006-07-14 19:06:25 +0000
committerAvuton Olrich <avuton@gmail.com>2006-07-14 19:06:25 +0000
commit21d8065b208535eb63b7e2ee417332aae25f2380 (patch)
tree115dd0777711d9b2f6faa234a2469ad8c349b6e3
parentd9f31b1c477df5080d8496babb4476565c073b53 (diff)
downloadmpd-21d8065b208535eb63b7e2ee417332aae25f2380.tar.gz
mpd-21d8065b208535eb63b7e2ee417332aae25f2380.tar.xz
mpd-21d8065b208535eb63b7e2ee417332aae25f2380.zip
[CLEANUP] Remove unused code
Static what makes sense git-svn-id: https://svn.musicpd.org/mpd/trunk@4327 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--src/interface.c44
-rw-r--r--src/interface.h3
2 files changed, 12 insertions, 35 deletions
diff --git a/src/interface.c b/src/interface.c
index 7d29fbe74..429865240 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -83,13 +83,13 @@ typedef struct _Interface {
int outBufSize;
} Interface;
-Interface * interfaces = NULL;
+static Interface * interfaces = NULL;
-void flushInterfaceBuffer(Interface * interface);
+static void flushInterfaceBuffer(Interface * interface);
-void printInterfaceOutBuffer(Interface * interface);
+static void printInterfaceOutBuffer(Interface * interface);
-void openInterface(Interface * interface, int fd) {
+static void openInterface(Interface * interface, int fd) {
int flags;
assert(interface->open==0);
@@ -135,7 +135,7 @@ void openInterface(Interface * interface, int fd) {
printInterfaceOutBuffer(interface);
}
-void closeInterface(Interface * interface) {
+static void closeInterface(Interface * interface) {
if (!interface->open) return;
interface->open = 0;
@@ -330,7 +330,7 @@ static int processBytesRead(Interface * interface, int bytesRead) {
return ret;
}
-int interfaceReadInput(Interface * interface) {
+static int interfaceReadInput(Interface * interface) {
int bytesRead;
bytesRead = read(interface->fd,
@@ -346,7 +346,7 @@ int interfaceReadInput(Interface * interface) {
return 1;
}
-void addInterfacesReadyToReadAndListenSocketToFdSet(fd_set * fds, int * fdmax) {
+static void addInterfacesReadyToReadAndListenSocketToFdSet(fd_set * fds, int * fdmax) {
int i;
FD_ZERO(fds);
@@ -360,7 +360,7 @@ void addInterfacesReadyToReadAndListenSocketToFdSet(fd_set * fds, int * fdmax) {
}
}
-void addInterfacesForBufferFlushToFdSet(fd_set * fds, int * fdmax) {
+static void addInterfacesForBufferFlushToFdSet(fd_set * fds, int * fdmax) {
int i;
FD_ZERO(fds);
@@ -373,7 +373,7 @@ void addInterfacesForBufferFlushToFdSet(fd_set * fds, int * fdmax) {
}
}
-void closeNextErroredInterface() {
+static void closeNextErroredInterface() {
fd_set fds;
struct timeval tv;
int i;
@@ -506,7 +506,7 @@ void initInterfaces() {
}
}
-void closeAllInterfaces() {
+static void closeAllInterfaces() {
int i;
fflush(NULL);
@@ -545,17 +545,7 @@ void closeOldInterfaces() {
}
}
-void closeInterfaceWithFD(int fd) {
- int i;
-
- for(i=0;i<interface_max_connections;i++) {
- if(interfaces[i].fd==fd) {
- closeInterface(&(interfaces[i]));
- }
- }
-}
-
-void flushInterfaceBuffer(Interface * interface) {
+static void flushInterfaceBuffer(Interface * interface) {
ListNode * node = NULL;
char * str;
int ret = 0;
@@ -592,16 +582,6 @@ void flushInterfaceBuffer(Interface * interface) {
}
}
-void flushAllInterfaceBuffers() {
- int i;
-
- for(i=0;i<interface_max_connections;i++) {
- if(interfaces[i].open && !interfaces[i].expired && interfaces[i].bufferList) {
- flushInterfaceBuffer(&interfaces[i]);
- }
- }
-}
-
int interfacePrintWithFD(int fd, char * buffer, int buflen) {
static int i = 0;
int copylen;
@@ -639,7 +619,7 @@ int interfacePrintWithFD(int fd, char * buffer, int buflen) {
return 0;
}
-void printInterfaceOutBuffer(Interface * interface) {
+static void printInterfaceOutBuffer(Interface * interface) {
char * buffer;
int ret;
diff --git a/src/interface.h b/src/interface.h
index 15fbf0075..4fecb1c4a 100644
--- a/src/interface.h
+++ b/src/interface.h
@@ -28,11 +28,8 @@
void initInterfaces();
void openAInterface(int fd, struct sockaddr * addr);
-void closeAllInterfaces();
void freeAllInterfaces();
void closeOldInterfaces();
-void closeInterfaceWithFD(int fd);
-void flushAllInterfaceBuffers();
int interfacePrintWithFD(int fd, char * buffer, int len);
int doIOForInterfaces();