be more carful wrt. signed vs. unsigned argument passing
[paraslash.git] / ortp_recv.c
index 287d706..c969672 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -68,17 +68,16 @@ uint32_t chunk_ts;
 
 static int msg_to_buf(mblk_t *mp, char *buffer, int len)
 {
-       int rlen = len;
        mblk_t *m, *mprev;
-       int mlen;
+       size_t mlen, rlen = len;
 
        m = mp->b_cont;
        mprev = mp;
        while (m != NULL) {
-               mlen = (int) (m->b_wptr - m->b_rptr);
+               mlen = m->b_wptr - m->b_rptr;
                if (mlen <= rlen) {
                        mblk_t *consumed = m;
-                       memcpy (buffer, m->b_rptr, mlen);
+                       memcpy(buffer, m->b_rptr, mlen);
                        /* go to next mblk_t */
                        mprev->b_cont = m->b_cont;
                        m = m->b_cont;
@@ -86,7 +85,7 @@ static int msg_to_buf(mblk_t *mp, char *buffer, int len)
                        freeb (consumed);
                        buffer += mlen;
                        rlen -= mlen;
-               } else {  /*if mlen>rlen */
+               } else {
                        memcpy (buffer, m->b_rptr, rlen);
                        m->b_rptr += rlen;
                        return len;
@@ -133,6 +132,7 @@ static void ortp_recv_post_select(__a_unused struct sched *s, struct task *t)
        int packet_type, stream_type;
        char tmpbuf[CHUNK_SIZE + 3];
        unsigned chunk_time;
+       size_t packet_size;
 
 //     PARA_INFO_LOG("rn: %p, pord: %p, session: %p\n", rn, pord, pord->session);
        t->ret = -E_ORTP_RECV_EOF;
@@ -169,6 +169,7 @@ static void ortp_recv_post_select(__a_unused struct sched *s, struct task *t)
                        t->ret = -E_ORTP_RECV_EOF;
                goto err_out;
        }
+       packet_size = t->ret;
        packet_type = READ_PACKET_TYPE(tmpbuf);
        stream_type = READ_STREAM_TYPE(tmpbuf);
        chunk_time = READ_CHUNK_TIME(tmpbuf);
@@ -183,48 +184,43 @@ static void ortp_recv_post_select(__a_unused struct sched *s, struct task *t)
                t->ret = -E_ORTP_RECV_EOF;
                goto err_out;
        case ORTP_BOF:
-               PARA_INFO_LOG("bof (%d)\n", t->ret);
+               PARA_INFO_LOG("bof (%zu)\n", packet_size);
                pord->have_header = 1;
                /* fall through */
        case ORTP_DATA:
                if (!pord->have_header && stream_type)
                /* can't use the data, wait for header */
                        goto success;
-               if (t->ret + rn->loaded >= CHUNK_SIZE + ORTP_AUDIO_HEADER_LEN) {
-                       t->ret = -E_OVERRUN;
+               t->ret = -E_OVERRUN;
+               if (packet_size + rn->loaded >= CHUNK_SIZE + ORTP_AUDIO_HEADER_LEN)
                        goto err_out;
-               }
-               if (t->ret > ORTP_AUDIO_HEADER_LEN) {
+               if (packet_size > ORTP_AUDIO_HEADER_LEN) {
                        memcpy(rn->buf + rn->loaded, tmpbuf + ORTP_AUDIO_HEADER_LEN,
-                               t->ret - ORTP_AUDIO_HEADER_LEN);
-                       rn->loaded += t->ret - ORTP_AUDIO_HEADER_LEN;
+                               packet_size - ORTP_AUDIO_HEADER_LEN);
+                       rn->loaded += packet_size - ORTP_AUDIO_HEADER_LEN;
                }
                goto success;
        case ORTP_HEADER:
                header_len = READ_HEADER_LEN(tmpbuf);
-               PARA_DEBUG_LOG("header packet (%d bytes), header len: %d\n",
-                       t->ret, header_len);
+               PARA_DEBUG_LOG("header packet (%zu bytes), header len: %d\n",
+                       packet_size, header_len);
                if (!pord->have_header) {
                        pord->have_header = 1;
                        memcpy(rn->buf, tmpbuf + ORTP_AUDIO_HEADER_LEN,
-                               t->ret - ORTP_AUDIO_HEADER_LEN);
-                       rn->loaded = t->ret - ORTP_AUDIO_HEADER_LEN;
+                               packet_size - ORTP_AUDIO_HEADER_LEN);
+                       rn->loaded = packet_size - ORTP_AUDIO_HEADER_LEN;
                        goto success;
                }
-               if (header_len + ORTP_AUDIO_HEADER_LEN > t->ret) {
-                       t->ret = -E_INVALID_HEADER;
+               t->ret = -E_INVALID_HEADER;
+               if (header_len + ORTP_AUDIO_HEADER_LEN > packet_size)
                        goto err_out;
-               }
-               payload_len = t->ret - ORTP_AUDIO_HEADER_LEN - header_len;
-//             PARA_INFO_LOG("len: %d header_len: %d, payload_len: %d, loaded: %d\n", ret,
-//                     header_len, payload_len, rn->loaded);
-               if (rn->loaded + payload_len > CHUNK_SIZE) {
-                       t->ret = -E_OVERRUN;
+               payload_len = packet_size - ORTP_AUDIO_HEADER_LEN - header_len;
+               t->ret = -E_OVERRUN;
+               if (rn->loaded + payload_len > CHUNK_SIZE)
                        goto err_out;
-               }
                if (payload_len)
                        memcpy(rn->buf + rn->loaded, tmpbuf
-                               + (t->ret - payload_len), payload_len);
+                               + (packet_size - payload_len), payload_len);
                rn->loaded += payload_len;
                goto success;
        }
@@ -261,7 +257,8 @@ static void *ortp_recv_parse_config(int argc, char **argv)
 {
        int ret;
 
-       struct ortp_recv_args_info *tmp = para_calloc(sizeof(struct ortp_recv_args_info));
+       struct ortp_recv_args_info *tmp =
+               para_calloc(sizeof(struct ortp_recv_args_info));
 
        ret = ortp_recv_cmdline_parser(argc, argv, tmp)? -E_ORTP_SYNTAX : 1;
        if (ret > 0)