Source-Changes-HG archive

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

[src/trunk]: src/sys/rump/net/lib/libsockin fix name clash i introduced when ...



details:   https://anonhg.NetBSD.org/src/rev/8be7ab9778ed
branches:  trunk
changeset: 330458:8be7ab9778ed
user:      rtr <rtr%NetBSD.org@localhost>
date:      Wed Jul 09 15:37:55 2014 +0000

description:
fix name clash i introduced when adding sockin_accept() pru by renaming
the rump sockin_accept(struct socket *) to sockin_waccept(struct socket *)

not a very creative name the 'w' indicates worker and was chosen to
prefix the word accept to make it not pattern match with _accept. if
someone prefers a different name then please feel free to change it.

diffstat:

 sys/rump/net/lib/libsockin/sockin.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 8108aa337e0e -r 8be7ab9778ed sys/rump/net/lib/libsockin/sockin.c
--- a/sys/rump/net/lib/libsockin/sockin.c       Wed Jul 09 14:41:42 2014 +0000
+++ b/sys/rump/net/lib/libsockin/sockin.c       Wed Jul 09 15:37:55 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sockin.c,v 1.48 2014/07/09 14:41:43 rtr Exp $  */
+/*     $NetBSD: sockin.c,v 1.49 2014/07/09 15:37:55 rtr Exp $  */
 
 /*
  * Copyright (c) 2008, 2009 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.48 2014/07/09 14:41:43 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.49 2014/07/09 15:37:55 rtr Exp $");
 
 #include <sys/param.h>
 #include <sys/condvar.h>
@@ -284,7 +284,7 @@
 }
 
 static void
-sockin_accept(struct socket *so)
+sockin_waccept(struct socket *so)
 {
        struct socket *nso;
        struct sockaddr_in6 sin;
@@ -363,7 +363,7 @@
                                                so = su_iter->su_so;
                                                mutex_exit(&su_mtx);
                                                if(so->so_options&SO_ACCEPTCONN)
-                                                       sockin_accept(so);
+                                                       sockin_waccept(so);
                                                else
                                                        sockin_process(so);
                                                mutex_enter(&su_mtx);



Home | Main Index | Thread Index | Old Index