From: Andre Noll <maan@systemlinux.org>
Date: Sat, 12 Apr 2008 07:31:08 +0000 (+0200)
Subject: Make vss_send_chunk() static.
X-Git-Tag: v0.3.3~93
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=6ced7bc77aaa1ab5f8c5922fbc8674d1f2253906;p=paraslash.git

Make vss_send_chunk() static.
---

diff --git a/vss.c b/vss.c
index 4024284a..a59c00f8 100644
--- a/vss.c
+++ b/vss.c
@@ -97,6 +97,25 @@ unsigned int vss_stopped(void)
 		&& !(mmd->new_vss_status_flags & VSS_PLAYING);
 }
 
+/**
+ * Get the data of the given chunk.
+ *
+ * \param chunk_num The number of the desired chunk.
+ * \param buf Chunk data.
+ * \param len Chunk length in bytes.
+ *
+ * \return Standard.
+ */
+int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len)
+{
+	if (!map || !vss_playing())
+		return -E_CHUNK;
+	if (chunk_num >= mmd->afd.afhi.chunks_total)
+		return -E_CHUNK;
+	afh_get_chunk(chunk_num, &mmd->afd.afhi, map, buf, len);
+	return 1;
+}
+
 /**
  * Initialize the virtual streaming system.
  *
@@ -415,45 +434,6 @@ err:
 	mmd->new_vss_status_flags = VSS_NEXT;
 }
 
-void vss_post_select(fd_set *rfds, fd_set *wfds)
-{
-	int ret, i;
-
-	if (afsss != AFS_SOCKET_CHECK_FOR_WRITE) {
-		if (FD_ISSET(afs_socket, rfds))
-			recv_afs_result();
-	} else if (FD_ISSET(afs_socket, wfds)) {
-		PARA_NOTICE_LOG("requesting new fd from afs\n");
-		ret = send_buffer(afs_socket, "new");
-		afsss = AFS_SOCKET_AFD_PENDING;
-	}
-	for (i = 0; senders[i].name; i++) {
-		if (!senders[i].post_select)
-			continue;
-		senders[i].post_select(rfds, wfds);
-	}
-	vss_send_chunk();
-}
-
-/**
- * Get the data of the given chunk.
- *
- * \param chunk_num The number of the desired chunk.
- * \param buf Chunk data.
- * \param len Chunk length in bytes.
- *
- * \return Standard.
- */
-int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len)
-{
-	if (!map || !vss_playing())
-		return -E_CHUNK;
-	if (chunk_num >= mmd->afd.afhi.chunks_total)
-		return -E_CHUNK;
-	afh_get_chunk(chunk_num, &mmd->afd.afhi, map, buf, len);
-	return 1;
-}
-
 /**
  * Main sending function.
  *
@@ -463,7 +443,7 @@ int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len)
  * each supported sender's send() function which is supposed to send out the data
  * to all connected clients.
  */
-void vss_send_chunk(void)
+static void vss_send_chunk(void)
 {
 	int i;
 	struct timeval now, due;
@@ -505,3 +485,23 @@ void vss_send_chunk(void)
 	mmd->chunks_sent++;
 	mmd->current_chunk++;
 }
+
+void vss_post_select(fd_set *rfds, fd_set *wfds)
+{
+	int ret, i;
+
+	if (afsss != AFS_SOCKET_CHECK_FOR_WRITE) {
+		if (FD_ISSET(afs_socket, rfds))
+			recv_afs_result();
+	} else if (FD_ISSET(afs_socket, wfds)) {
+		PARA_NOTICE_LOG("requesting new fd from afs\n");
+		ret = send_buffer(afs_socket, "new");
+		afsss = AFS_SOCKET_AFD_PENDING;
+	}
+	for (i = 0; senders[i].name; i++) {
+		if (!senders[i].post_select)
+			continue;
+		senders[i].post_select(rfds, wfds);
+	}
+	vss_send_chunk();
+}
diff --git a/vss.h b/vss.h
index 3b238eb7..98af4220 100644
--- a/vss.h
+++ b/vss.h
@@ -6,7 +6,6 @@
 
 /** \file vss.h exported functions from vss.c (para_server) */
 void vss_init(void);
-void vss_send_chunk(void);
 struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno);
 void vss_post_select(fd_set *rfds, fd_set *wfds);
 unsigned int vss_playing(void);