first version of the universal paraslash scheduler
[paraslash.git] / command.c
index 1f94bbc..531c776 100644 (file)
--- 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;
@@ -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);
@@ -559,7 +560,6 @@ 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, __a_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,13 +586,12 @@ static int com_si(int fd, int argc, __a_unused char **argv)
                "%s",
                ut, mmd->num_played,
                getppid(),
-               mi.arena / 1024,
                mmd->active_connections,
                mmd->num_commands,
                mmd->num_connects,
                conf.loglevel_arg,
                selector_string,
-               SUPPORTED_AUDIO_FORMATS,
+               supported_audio_formats(),
                sender_list,
                sender_info
        );
@@ -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) {