X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=d0d9047b7d3d97dc1061a6c52db158e500d4969c;hp=9ef629257134e4d8cad97fc344b30e0be473956d;hb=0a405367cdc8f3b0f49fb5ec3798378a2fc4589b;hpb=eb0b03d2d24db75d1ece27b1cec133fc7df7d1c3

diff --git a/command.c b/command.c
index 9ef62925..d0d9047b 100644
--- a/command.c
+++ b/command.c
@@ -341,18 +341,18 @@ int com_si(int fd, int argc, __a_unused char **argv)
 }
 
 /* version */
-int com_version(int socket_fd, int argc, __a_unused char **argv)
+int com_version(int fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
-	return send_buffer(socket_fd, VERSION_TEXT("server")
+	return send_buffer(fd, VERSION_TEXT("server")
 		"built: " BUILD_DATE "\n"
 		SYSTEM ", " CC_VERSION "\n"
 	);
 }
 
 /* sc */
-int com_sc(int socket_fd, int argc, char **argv)
+int com_sc(int fd, int argc, char **argv)
 {
 	char *name = NULL;
 	int ret, old = 0, count = -1; /* print af change forever */
@@ -367,7 +367,7 @@ repeat:
 	}
 	mmd_unlock();
 	if (name) {
-		ret = send_va_buffer(socket_fd, "%s\n", name);
+		ret = send_va_buffer(fd, "%s\n", name);
 		free(name);
 		name = NULL;
 		if (ret < 0)
@@ -380,7 +380,7 @@ repeat:
 }
 
 /* sb */
-int com_sb(int socket_fd, int argc, char **argv)
+int com_sb(int fd, int argc, char **argv)
 {
 	char *sb;
 	int ret, nr = -1;	/* status bar will be printed that many
@@ -393,7 +393,7 @@ int com_sb(int socket_fd, int argc, char **argv)
 		mmd_lock();
 		sb = get_sb_string(mmd);
 		mmd_unlock();
-		ret = send_va_buffer(socket_fd, "%s\n", sb);
+		ret = send_va_buffer(fd, "%s\n", sb);
 		free(sb);
 		if (ret < 0)
 			return ret;
@@ -407,7 +407,7 @@ int com_sb(int socket_fd, int argc, char **argv)
 }
 
 /* stat */
-int com_stat(int socket_fd, int argc, char **argv)
+int com_stat(int fd, int argc, char **argv)
 {
 	int ret, num = 0;/* status will be printed that many
 			  * times. num <= 0 means: print forever
@@ -423,7 +423,7 @@ int com_stat(int socket_fd, int argc, char **argv)
 
 		mmd_dup(nmmd);
 		s = get_status(nmmd);
-		ret = send_buffer(socket_fd, s);
+		ret = send_buffer(fd, s);
 		free(s);
 		if (ret < 0)
 			goto out;
@@ -525,7 +525,7 @@ int com_help(int fd, int argc, char **argv)
 }
 
 /* hup */
-int com_hup(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_hup(__a_unused int fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -534,7 +534,7 @@ int com_hup(__a_unused int socket_fd, int argc, __a_unused char **argv)
 }
 
 /* term */
-int com_term(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_term(__a_unused int fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -542,7 +542,7 @@ int com_term(__a_unused int socket_fd, int argc, __a_unused char **argv)
 	return 1;
 }
 
-int com_play(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_play(__a_unused int fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -555,7 +555,7 @@ int com_play(__a_unused int socket_fd, int argc, __a_unused char **argv)
 }
 
 /* stop */
-int com_stop(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_stop(__a_unused int fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -568,7 +568,7 @@ int com_stop(__a_unused int socket_fd, int argc, __a_unused char **argv)
 }
 
 /* pause */
-int com_pause(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_pause(__a_unused int fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -607,7 +607,7 @@ int com_chs(int fd, int argc, char **argv)
 }
 
 /* next */
-int com_next(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_next(__a_unused int fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -619,7 +619,7 @@ int com_next(__a_unused int socket_fd, int argc, __a_unused char **argv)
 }
 
 /* nomore */
-int com_nomore(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_nomore(__a_unused int fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -631,7 +631,7 @@ int com_nomore(__a_unused int socket_fd, int argc, __a_unused char **argv)
 }
 
 /* ff */
-int com_ff(__a_unused int socket_fd, int argc, char **argv)
+int com_ff(__a_unused int fd, int argc, char **argv)
 {
 	long promille;
 	int ret, backwards = 0;
@@ -670,7 +670,7 @@ out:
 }
 
 /* jmp */
-int com_jmp(__a_unused int socket_fd, int argc, char **argv)
+int com_jmp(__a_unused int fd, int argc, char **argv)
 {
 	long unsigned int i;
 	int ret;