Fix some unsigned vs. size_t issues.

vss_het_header() took a unsigned while vss_get_chunk() takes
a size_t. Change vss_het_header() and fix up the callers.

diff --git a/dccp_send.c b/dccp_send.c
index f61427169e83d5366c1d1509666405573944e504..3d2511f7ef755e759a2d2f486d4060a785cff225 100644 (file)
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -182,7 +182,7 @@ static void dccp_send(long unsigned current_chunk,
        struct dccp_client *dc, *tmp;
        int ret;
        char *header_buf;
-       unsigned header_len;
+       size_t header_len;
 
        if (listen_fd < 0 || !len)
                return;

diff --git a/http_send.c b/http_send.c
index bbf634100c6de88e95c2e426de5c5a09d4dcfc80..e7a9ae2bc50c201c52cf0d3b25f896ecec515dd9 100644 (file)
--- a/http_send.c
+++ b/http_send.c
@@ -165,11 +165,11 @@ static void http_send( long unsigned current_chunk,
                                hc->status != HTTP_READY_TO_STREAM)
                        continue;
                if (hc->status == HTTP_READY_TO_STREAM) {
-                       unsigned hlen;
+                       size_t hlen;
                        char *hbuf = vss_get_header(&hlen);
                        if (hbuf && hlen > 0 && current_chunk) {
                                /* need to send header */
-                               PARA_INFO_LOG("queueing header: %d\n", hlen);
+                               PARA_INFO_LOG("queueing header: %zu\n", hlen);
                                if (queue_chunk_or_shutdown(hc, -1U, 0) < 0)
                                        continue;
                        } else

diff --git a/vss.c b/vss.c
index a16b006ffa0527d5d4f4301b1e13122457b1756a..c15fbd7e6898537f2c9e6a26ee067c61ab7455da 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -400,7 +400,7 @@ static void vss_eof(void)
  * treamtment.
  *
  */
-char *vss_get_header(unsigned *header_len)
+char *vss_get_header(size_t *header_len)
 {
        if (mmd->audio_format < 0 || !map || !mmd->afi.header_len)
                return NULL;

diff --git a/vss.h b/vss.h
index bd3b4d71084bb67167ec50e787b73d254131850a..7d2764dae647e0926d11095499c5a6957d980c2f 100644 (file)
--- a/vss.h
+++ b/vss.h
@@ -13,7 +13,7 @@ unsigned int vss_playing(void);
 unsigned int vss_next(void);
 unsigned int vss_repos(void);
 unsigned int vss_paused(void);
-char *vss_get_header(unsigned *header_len);
+char *vss_get_header(size_t *header_len);
 struct timeval *vss_chunk_time(void);
 int guess_audio_format(const char *name);
 const char *supported_audio_formats(void);