X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=e625990213b295b9be3577db3670dbc6d80f3427;hp=1f94bbc25cc634d4b889e975106e32bb67c0c69f;hb=95488d221ea22f761a6a4b78410c4e0e89f522b8;hpb=e0e5a7c1a04c6a2ee4a475e823657e06e6df2f99 diff --git a/command.c b/command.c index 1f94bbc2..e6259902 100644 --- a/command.c +++ b/command.c @@ -18,7 +18,6 @@ /** \file command.c does client authentication and executes server commands */ -#include /* mallinfo */ #include /* gettimeofday */ #include "crypt.h" #include "server.cmdline.h" @@ -434,9 +433,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 +561,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 +579,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,7 +587,6 @@ 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,