X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=f2c54973888ab17557f2854eaa069dc52563837c;hp=e820e41a5d1deefbdf6b40601e88e04c19c09a01;hb=e921be422a216b87e3e6812f16b27c9a6927099d;hpb=69f0930489da9ace5af8aee104ad21d188aed387

diff --git a/command.c b/command.c
index e820e41a..f2c54973 100644
--- a/command.c
+++ b/command.c
@@ -18,7 +18,6 @@
 
 /** \file command.c does client authentication and executes server commands */
 
-#include <malloc.h> /* mallinfo */
 #include <sys/time.h> /* gettimeofday */
 #include "crypt.h"
 #include "server.cmdline.h"
@@ -45,7 +44,6 @@ extern const char *status_item_list[NUM_STAT_ITEMS];
 extern struct misc_meta_data *mmd;
 extern struct gengetopt_args_info conf;
 extern struct audio_file_selector selectors[];
-extern struct audio_format afl[];
 extern struct sender senders[];
 extern char *user_list;
 struct sockaddr_in *in_addr;
@@ -309,7 +307,7 @@ static struct server_command cmd_struct[] = {
 }
 };
 
-static void dummy(__unused int s)
+static void dummy(__a_unused int s)
 {}
 
 static void mmd_dup(struct misc_meta_data *new_mmd)
@@ -434,9 +432,12 @@ static char *get_status(struct misc_meta_data *nmmd)
 		nmmd->audio_file_info,
 
 		status_item_list[SI_UPTIME], ut,
-		status_item_list[SI_STREAM_START], nmmd->stream_start.tv_sec,
-			nmmd->stream_start.tv_usec,
-		status_item_list[SI_CURRENT_TIME], now.tv_sec, now.tv_usec
+		status_item_list[SI_STREAM_START],
+			(long unsigned)nmmd->stream_start.tv_sec,
+			(long unsigned)nmmd->stream_start.tv_usec,
+		status_item_list[SI_CURRENT_TIME],
+			(long unsigned)now.tv_sec,
+			(long unsigned)now.tv_usec
 
 	);
 	free(bar);
@@ -554,12 +555,11 @@ static int com_sender(int fd, int argc, char **argv)
 }
 
 /* server info */
-static int com_si(int fd, int argc, __unused char **argv)
+static int com_si(int fd, int argc, __a_unused char **argv)
 {
 	int i, ret;
 	char *ut;
 	char *selector_string = NULL, *sender_info = NULL, *sender_list = NULL;
-	struct mallinfo mi = mallinfo();
 
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -578,7 +578,6 @@ static int com_si(int fd, int argc, __unused char **argv)
 	ut = uptime_str();
 	ret = send_va_buffer(fd, "up: %s\nplayed: %u\n"
 		"pid: %d\n"
-		"mallinfo: %d\n"
 		"connections (active/accepted/total): %u/%u/%u\n"
 		"current loglevel: %i\n"
 		"supported audio file selectors: %s\n"
@@ -587,7 +586,6 @@ static int com_si(int fd, int argc, __unused char **argv)
 		"%s",
 		ut, mmd->num_played,
 		getppid(),
-		mi.arena / 1024,
 		mmd->active_connections,
 		mmd->num_commands,
 		mmd->num_connects,
@@ -606,7 +604,7 @@ static int com_si(int fd, int argc, __unused char **argv)
 }
 
 /* version */
-static int com_version(int socket_fd, int argc, __unused char **argv)
+static int com_version(int socket_fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -791,7 +789,7 @@ static int com_help(int fd, int argc, char **argv)
 }
 
 /* hup */
-static int com_hup(__unused int socket_fd, int argc, __unused char **argv)
+static int com_hup(__a_unused int socket_fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -800,7 +798,7 @@ static int com_hup(__unused int socket_fd, int argc, __unused char **argv)
 }
 
 /* term */
-static int com_term(__unused int socket_fd, int argc, __unused char **argv)
+static int com_term(__a_unused int socket_fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -808,7 +806,7 @@ static int com_term(__unused int socket_fd, int argc, __unused char **argv)
 	return 1;
 }
 
-static int com_play(__unused int socket_fd, int argc, __unused char **argv)
+static int com_play(__a_unused int socket_fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -821,7 +819,7 @@ static int com_play(__unused int socket_fd, int argc, __unused char **argv)
 }
 
 /* stop */
-static int com_stop(__unused int socket_fd, int argc, __unused char **argv)
+static int com_stop(__a_unused int socket_fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -834,7 +832,7 @@ static int com_stop(__unused int socket_fd, int argc, __unused char **argv)
 }
 
 /* pause */
-static int com_pause(__unused int socket_fd, int argc, __unused char **argv)
+static int com_pause(__a_unused int socket_fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -873,9 +871,9 @@ static int com_chs(int fd, int argc, char **argv)
 }
 
 /* next */
-static int com_next(__unused int socket_fd, int argc, __unused char **argv)
+static int com_next(__a_unused int socket_fd, int argc, __a_unused char **argv)
 {
-	if (argc =! 1)
+	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
 	mmd_lock();
 	mmd->events++;
@@ -885,7 +883,7 @@ static int com_next(__unused int socket_fd, int argc, __unused char **argv)
 }
 
 /* nomore */
-static int com_nomore(__unused int socket_fd, int argc, __unused char **argv)
+static int com_nomore(__a_unused int socket_fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -897,7 +895,7 @@ static int com_nomore(__unused int socket_fd, int argc, __unused char **argv)
 }
 
 /* ff */
-static int com_ff(__unused int socket_fd, int argc, char **argv)
+static int com_ff(__a_unused int socket_fd, int argc, char **argv)
 {
 	long promille;
 	int ret, backwards = 0;
@@ -936,7 +934,7 @@ out:
 }
 
 /* jmp */
-static int com_jmp(__unused int socket_fd, int argc, char **argv)
+static int com_jmp(__a_unused int socket_fd, int argc, char **argv)
 {
 	long unsigned int i;
 	int ret;
@@ -1176,7 +1174,7 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	if (use_rc4) {
 		crypt_function_recv = rc4_recv;
 		crypt_function_send = rc4_send;
-		PARA_INFO_LOG("%s", "rc4 encrytion activated\n");
+		PARA_INFO_LOG("%s", "rc4 encryption activated\n");
 	}
 	/* read command */
 	while ((numbytes = recv_buffer(fd, buf, sizeof(buf))) > 0) {