Merge branch 'master' of /home/nchip/public_html/qemu into garage-push

[qemu] / slirp / sbuf.c

diff --git a/slirp/sbuf.c b/slirp/sbuf.c
index b0e0838..5375414 100644 (file)
--- a/slirp/sbuf.c
+++ b/slirp/sbuf.c
@@ -18,16 +18,13 @@ static void sbappendsb(struct sbuf *sb, struct mbuf *m);
  */
 
 void
-sbfree(sb)
-       struct sbuf *sb;
+sbfree(struct sbuf *sb)
 {
        free(sb->sb_data);
 }
 
 void
-sbdrop(sb, num)
-       struct sbuf *sb;
-       int num;
+sbdrop(struct sbuf *sb, int num)
 {
        /*
         * We can only drop how much we have
@@ -43,9 +40,7 @@ sbdrop(sb, num)
 }
 
 void
-sbreserve(sb, size)
-       struct sbuf *sb;
-       int size;
+sbreserve(struct sbuf *sb, int size)
 {
        if (sb->sb_data) {
                /* Already alloced, realloc if necessary */
@@ -74,9 +69,7 @@ sbreserve(sb, size)
  * (the socket is non-blocking, so we won't hang)
  */
 void
-sbappend(so, m)
-       struct socket *so;
-       struct mbuf *m;
+sbappend(struct socket *so, struct mbuf *m)
 {
        int ret = 0;
 
@@ -108,7 +101,7 @@ sbappend(so, m)
         * ottherwise it'll arrive out of order, and hence corrupt
         */
        if (!so->so_rcv.sb_cc)
-          ret = send(so->s, m->m_data, m->m_len, 0);
+          ret = slirp_send(so, m->m_data, m->m_len, 0);
 
        if (ret <= 0) {
                /*
@@ -173,11 +166,7 @@ sbappendsb(struct sbuf *sb, struct mbuf *m)
  * done in sbdrop when the data is acked
  */
 void
-sbcopy(sb, off, len, to)
-       struct sbuf *sb;
-       int off;
-       int len;
-       char *to;
+sbcopy(struct sbuf *sb, int off, int len, char *to)
 {
        char *from;