]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
freetdm: ftmod_r2 - fixed complation warnings on windows
authorArnaldo Pereira <arnaldo@sangoma.com>
Tue, 7 Dec 2010 22:33:23 +0000 (20:33 -0200)
committerDavid Yat Sin <dyatsin@sangoma.com>
Thu, 9 Dec 2010 20:21:10 +0000 (15:21 -0500)
libs/freetdm/src/ftdm_io.c

index f0a3df6da07ffea2fc126d533ea2de24d69cc210..a54c515f4ad4744ccf8b7cd7ef3681bd3d984d3d 100644 (file)
@@ -104,7 +104,7 @@ static void write_chan_io_dump(ftdm_io_dump_t *dump, char *dataptr, int dlen)
        if (dlen > avail) {
                int diff = dlen - avail;
                
-               ftdm_assert(diff < dump->size, "Very small buffer or very big IO chunk!\n");
+               ftdm_assert(diff < (int)dump->size, "Very small buffer or very big IO chunk!\n");
 
                /* write only what we can and the rest at the beginning of the buffer */
                memcpy(&dump->buffer[windex], dataptr, avail);
@@ -118,7 +118,7 @@ static void write_chan_io_dump(ftdm_io_dump_t *dump, char *dataptr, int dlen)
                windex += dlen;
        }
 
-       if (windex == dump->size) {
+       if (windex == (int)dump->size) {
                /*ftdm_log_chan(fchan, FTDM_LOG_DEBUG, "wrapping around dump buffer %p\n", dump);*/
                windex = 0;
                dump->wrapped = 1;
@@ -3421,8 +3421,8 @@ static FIO_READ_FUNCTION(ftdm_raw_read)
 {
        ftdm_status_t  status = ftdmchan->fio->read(ftdmchan, data, datalen);
        if (status == FTDM_SUCCESS && ftdmchan->fds[FTDM_READ_TRACE_INDEX] > -1) {
-               int dlen = (int) *datalen;
-               if (write(ftdmchan->fds[FTDM_READ_TRACE_INDEX], data, dlen) != dlen) {
+               ftdm_size_t dlen = *datalen;
+               if ((ftdm_size_t)write(ftdmchan->fds[FTDM_READ_TRACE_INDEX], data, dlen) != dlen) {
                        ftdm_log(FTDM_LOG_WARNING, "Raw input trace failed to write all of the %zd bytes\n", dlen);
                }
        }
@@ -3432,8 +3432,8 @@ static FIO_READ_FUNCTION(ftdm_raw_read)
        }
 
        if (status == FTDM_SUCCESS) {
-               int dlen = (int) *datalen;
-               size_t rc = 0;
+               ftdm_size_t dlen = *datalen;
+               ftdm_size_t rc = 0;
 
                write_chan_io_dump(&ftdmchan->rxdump, data, dlen);