AMD64 - Refactor uio_resid and size_t assumptions.

[dragonfly.git] / sys / net / i4b / driver / i4b_tel.c

diff --git a/sys/net/i4b/driver/i4b_tel.c b/sys/net/i4b/driver/i4b_tel.c
index b19413b..6ac82d6 100644 (file)
--- a/sys/net/i4b/driver/i4b_tel.c
+++ b/sys/net/i4b/driver/i4b_tel.c
@@ -578,9 +578,9 @@ i4btelwrite(struct dev_write_args *ap)
                {
                        int i;
                        
-                       m->m_len = min(BCH_MAX_DATALEN, uio->uio_resid);
+                       m->m_len = (int)szmin(BCH_MAX_DATALEN, uio->uio_resid);
        
-                       error = uiomove(m->m_data, m->m_len, uio);
+                       error = uiomove(m->m_data, (size_t)m->m_len, uio);
        
                        for(i = 0; i < m->m_len; i++)
                        {
@@ -605,9 +605,9 @@ i4btelwrite(struct dev_write_args *ap)
        {
 #define CMDBUFSIZ 80 
                char cmdbuf[CMDBUFSIZ];
-               int len = min(CMDBUFSIZ-1, uio->uio_resid);
+               int len = (int)szmin(CMDBUFSIZ-1, uio->uio_resid);
        
-               error = uiomove(cmdbuf, len, uio);
+               error = uiomove(cmdbuf, (size_t)len, uio);
 
                if(cmdbuf[0] == CMD_DIAL)
                {