be more carful wrt. signed vs. unsigned argument passing
[paraslash.git] / vss.c
diff --git a/vss.c b/vss.c
index a3c2e65..e1e4ead 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -158,6 +158,10 @@ void vss_init(void)
 {
        int i;
        char *hn = para_hostname(), *home = para_homedir();
 {
        int i;
        char *hn = para_hostname(), *home = para_homedir();
+       long unsigned announce_time = conf.announce_time_arg > 0?
+                       conf.announce_time_arg : 300,
+               autoplay_delay = conf.autoplay_delay_arg > 0?
+                       conf.autoplay_delay_arg : 0;
 
        PARA_DEBUG_LOG("supported audio formats: %s\n",
                SUPPORTED_AUDIO_FORMATS);
 
        PARA_DEBUG_LOG("supported audio formats: %s\n",
                SUPPORTED_AUDIO_FORMATS);
@@ -166,7 +170,7 @@ void vss_init(void)
                        afl[i].name);
                afl[i].init(&afl[i]);
        }
                        afl[i].name);
                afl[i].init(&afl[i]);
        }
-       ms2tv(conf.announce_time_arg, &announce_tv);
+       ms2tv(announce_time, &announce_tv);
        PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&announce_tv));
        for (i = 0; senders[i].name; i++) {
                PARA_NOTICE_LOG("initializing %s sender\n", senders[i].name);
        PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&announce_tv));
        for (i = 0; senders[i].name; i++) {
                PARA_NOTICE_LOG("initializing %s sender\n", senders[i].name);
@@ -179,7 +183,7 @@ void vss_init(void)
                mmd->vss_status_flags |= VSS_PLAYING;
                mmd->new_vss_status_flags |= VSS_PLAYING;
                gettimeofday(&now, NULL);
                mmd->vss_status_flags |= VSS_PLAYING;
                mmd->new_vss_status_flags |= VSS_PLAYING;
                gettimeofday(&now, NULL);
-               ms2tv(conf.autoplay_delay_arg, &tmp);
+               ms2tv(autoplay_delay, &tmp);
                tv_add(&now, &tmp, &autoplay_barrier);
        }
 }
                tv_add(&now, &tmp, &autoplay_barrier);
        }
 }
@@ -275,7 +279,7 @@ static void vss_get_audio_file(void)
                }
                mmd->size = file_status.st_size;
                mmd->mtime = file_status.st_mtime;
                }
                mmd->size = file_status.st_size;
                mmd->mtime = file_status.st_mtime;
-               map = para_mmap(file_status.st_size, PROT_READ, MAP_PRIVATE,
+               map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE,
                        audio_file, 0);
                strcpy(mmd->filename, sl[i]);
                mmd->afi.header_len = 0; /* default: no header */
                        audio_file, 0);
                strcpy(mmd->filename, sl[i]);
                mmd->afi.header_len = 0; /* default: no header */
@@ -408,7 +412,7 @@ static void vss_eof(void)
  * treamtment.
  *
  */
  * treamtment.
  *
  */
-char *vss_get_header(int *header_len)
+char *vss_get_header(unsigned *header_len)
 {
        if (mmd->audio_format < 0 || !map || !mmd->afi.header_len)
                return NULL;
 {
        if (mmd->audio_format < 0 || !map || !mmd->afi.header_len)
                return NULL;
@@ -516,7 +520,8 @@ void vss_send_chunk(void)
 {
        int i;
        struct audio_format_handler *af;
 {
        int i;
        struct audio_format_handler *af;
-       ssize_t pos, len;
+       ssize_t pos;
+       size_t len;
        struct timeval now, due;
 
        if (mmd->audio_format < 0 || !map || !vss_playing())
        struct timeval now, due;
 
        if (mmd->audio_format < 0 || !map || !vss_playing())