Merge branch 'sched'
[paraslash.git] / command.c
index 43c02ff..531c776 100644 (file)
--- a/command.c
+++ b/command.c
@@ -44,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;
@@ -436,7 +435,9 @@ static char *get_status(struct misc_meta_data *nmmd)
                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], now.tv_sec, now.tv_usec
+               status_item_list[SI_CURRENT_TIME],
+                       (long unsigned)now.tv_sec,
+                       (long unsigned)now.tv_usec
 
        );
        free(bar);
@@ -590,7 +591,7 @@ static int com_si(int fd, int argc, __a_unused char **argv)
                mmd->num_connects,
                conf.loglevel_arg,
                selector_string,
-               SUPPORTED_AUDIO_FORMATS,
+               supported_audio_formats(),
                sender_list,
                sender_info
        );
@@ -1173,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) {