Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Rename sbappend_stream() to sbappendstream(), per sugges...



details:   https://anonhg.NetBSD.org/src/rev/b4e298bc1d13
branches:  trunk
changeset: 533543:b4e298bc1d13
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Jul 03 21:36:57 2002 +0000

description:
Rename sbappend_stream() to sbappendstream(), per suggestion from
Jonathan Stone.

diffstat:

 sys/kern/uipc_socket2.c  |   6 +++---
 sys/netinet/tcp_input.c  |  10 +++++-----
 sys/netinet/tcp_usrreq.c |   8 ++++----
 sys/sys/socketvar.h      |   4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diffs (126 lines):

diff -r f4616285ffbd -r b4e298bc1d13 sys/kern/uipc_socket2.c
--- a/sys/kern/uipc_socket2.c   Wed Jul 03 20:41:20 2002 +0000
+++ b/sys/kern/uipc_socket2.c   Wed Jul 03 21:36:57 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_socket2.c,v 1.43 2002/07/03 19:06:49 thorpej Exp $        */
+/*     $NetBSD: uipc_socket2.c,v 1.44 2002/07/03 21:36:58 thorpej Exp $        */
 
 /*
  * Copyright (c) 1982, 1986, 1988, 1990, 1993
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.43 2002/07/03 19:06:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.44 2002/07/03 21:36:58 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -525,7 +525,7 @@
  * in the socket buffer, that is, a stream protocol (such as TCP).
  */
 void
-sbappend_stream(struct sockbuf *sb, struct mbuf *m)
+sbappendstream(struct sockbuf *sb, struct mbuf *m)
 {
 
        KDASSERT(m->m_nextpkt == NULL);
diff -r f4616285ffbd -r b4e298bc1d13 sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c   Wed Jul 03 20:41:20 2002 +0000
+++ b/sys/netinet/tcp_input.c   Wed Jul 03 21:36:57 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_input.c,v 1.147 2002/07/03 19:06:50 thorpej Exp $  */
+/*     $NetBSD: tcp_input.c,v 1.148 2002/07/03 21:36:58 thorpej Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -152,7 +152,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.147 2002/07/03 19:06:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.148 2002/07/03 21:36:58 thorpej Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -664,7 +664,7 @@
        if (so->so_state & SS_CANTRCVMORE)
                m_freem(q->ipqe_m);
        else
-               sbappend_stream(&so->so_rcv, q->ipqe_m);
+               sbappendstream(&so->so_rcv, q->ipqe_m);
        pool_put(&ipqent_pool, q);
        sorwakeup(so);
        return (pkt_flags);
@@ -1524,7 +1524,7 @@
                         * to socket buffer.
                         */
                        m_adj(m, toff + off);
-                       sbappend_stream(&so->so_rcv, m);
+                       sbappendstream(&so->so_rcv, m);
                        sorwakeup(so);
                        TCP_SETUP_ACK(tp, th);
                        if (tp->t_flags & TF_ACKNOW)
@@ -2263,7 +2263,7 @@
                        tcpstat.tcps_rcvbyte += tlen;
                        ND6_HINT(tp);
                        m_adj(m, hdroptlen);
-                       sbappend_stream(&(so)->so_rcv, m);
+                       sbappendstream(&(so)->so_rcv, m);
                        sorwakeup(so);
                } else {
                        m_adj(m, hdroptlen);
diff -r f4616285ffbd -r b4e298bc1d13 sys/netinet/tcp_usrreq.c
--- a/sys/netinet/tcp_usrreq.c  Wed Jul 03 20:41:20 2002 +0000
+++ b/sys/netinet/tcp_usrreq.c  Wed Jul 03 21:36:57 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_usrreq.c,v 1.72 2002/07/03 19:06:52 thorpej Exp $  */
+/*     $NetBSD: tcp_usrreq.c,v 1.73 2002/07/03 21:36:58 thorpej Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -102,7 +102,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.72 2002/07/03 19:06:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.73 2002/07/03 21:36:58 thorpej Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -508,7 +508,7 @@
                        error = EINVAL;
                        break;
                }
-               sbappend_stream(&so->so_snd, m);
+               sbappendstream(&so->so_snd, m);
                error = tcp_output(tp);
                break;
 
@@ -564,7 +564,7 @@
                 * of data past the urgent section.
                 * Otherwise, snd_up should be one lower.
                 */
-               sbappend_stream(&so->so_snd, m);
+               sbappendstream(&so->so_snd, m);
                tp->snd_up = tp->snd_una + so->so_snd.sb_cc;
                tp->t_force = 1;
                error = tcp_output(tp);
diff -r f4616285ffbd -r b4e298bc1d13 sys/sys/socketvar.h
--- a/sys/sys/socketvar.h       Wed Jul 03 20:41:20 2002 +0000
+++ b/sys/sys/socketvar.h       Wed Jul 03 21:36:57 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: socketvar.h,v 1.52 2002/07/03 19:06:54 thorpej Exp $   */
+/*     $NetBSD: socketvar.h,v 1.53 2002/07/03 21:36:57 thorpej Exp $   */
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -277,7 +277,7 @@
            struct mbuf *, struct mbuf *, struct proc *);
 int    uipc_ctloutput(int, struct socket *, int, int, struct mbuf **);
 void   sbappend(struct sockbuf *sb, struct mbuf *m);
-void   sbappend_stream(struct sockbuf *sb, struct mbuf *m);
+void   sbappendstream(struct sockbuf *sb, struct mbuf *m);
 int    sbappendaddr(struct sockbuf *sb, struct sockaddr *asa,
            struct mbuf *m0, struct mbuf *control);
 int    sbappendcontrol(struct sockbuf *sb, struct mbuf *m0,



Home | Main Index | Thread Index | Old Index