svn commit: r237296 - in stable/9: . share/man/man9 sys/kern

[Christian Brueffer]

Author: brueffer
Date: Wed Jun 20 09:38:35 2012
New Revision: 237296
URL: http://svn.freebsd.org/changeset/base/237296

Log:
  MFC: r232051
  
  Catch up with r195837 (2.5 years ago) which renamed net_add_domain() to domain_add().

Modified:
  stable/9/ObsoleteFiles.inc   (contents, props changed)
  stable/9/share/man/man9/Makefile
  stable/9/share/man/man9/domain.9
  stable/9/sys/kern/uipc_domain.c
Directory Properties:
  stable/9/share/man/man9/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/ObsoleteFiles.inc
==============================================================================
--- stable/9/ObsoleteFiles.inc	Wed Jun 20 09:01:44 2012	(r237295)
+++ stable/9/ObsoleteFiles.inc	Wed Jun 20 09:38:35 2012	(r237296)
@@ -677,6 +677,8 @@ OLD_LIBS+=usr/lib32/pam_tacplus.so.4
 OLD_LIBS+=usr/lib32/pam_unix.so.4
 # 20090718: the gdm pam.d file is no longer required.
 OLD_FILES+=etc/pam.d/gdm
+# 20090714: net_add_domain(9) renamed to domain_add(9)
+OLD_FILES+=usr/share/man/man9/net_add_domain.9.gz
 # 20090713: vimage container structs removed.
 OLD_FILES+=usr/include/netinet/vinet.h
 OLD_FILES+=usr/include/netinet6/vinet6.h

Modified: stable/9/share/man/man9/Makefile
==============================================================================
--- stable/9/share/man/man9/Makefile	Wed Jun 20 09:01:44 2012	(r237295)
+++ stable/9/share/man/man9/Makefile	Wed Jun 20 09:38:35 2012	(r237296)
@@ -614,7 +614,7 @@ MLINKS+=disk.9 disk_alloc.9 \
 	disk.9 disk_destroy.9 \
 	disk.9 disk_gone.9
 MLINKS+=domain.9 DOMAIN_SET.9 \
-	domain.9 net_add_domain.9 \
+	domain.9 domain_add.9 \
 	domain.9 pfctlinput.9 \
 	domain.9 pfctlinput2.9 \
 	domain.9 pffindproto.9 \

Modified: stable/9/share/man/man9/domain.9
==============================================================================
--- stable/9/share/man/man9/domain.9	Wed Jun 20 09:01:44 2012	(r237295)
+++ stable/9/share/man/man9/domain.9	Wed Jun 20 09:38:35 2012	(r237296)
@@ -26,11 +26,11 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 23, 2008
+.Dd February 23, 2012
 .Dt DOMAIN 9
 .Os
 .Sh NAME
-.Nm net_add_domain ,
+.Nm domain_add ,
 .Nm pfctlinput ,
 .Nm pfctlinput2 ,
 .Nm pffindproto ,
@@ -43,7 +43,7 @@
 .In sys/protosw.h
 .In sys/domain.h
 .Ft void
-.Fn net_add_domain "void *data"
+.Fn domain_add "void *data"
 .Ft void
 .Fn pfctlinput "int cmd" "struct sockaddr *sa"
 .Ft void
@@ -142,7 +142,7 @@ have their
 .Fn pr_ctlinput
 function called.
 .Pp
-.Fn net_add_domain
+.Fn domain_add
 adds a new protocol domain to the system.
 The argument
 .Fa data
@@ -153,13 +153,13 @@ within the function, but is declared
 in order to prevent compiler warnings when new domains are registered with
 .Fn SYSINIT .
 In most cases
-.Fn net_add_domain
+.Fn domain_add
 is not called directly, instead
 .Fn DOMAIN_SET
 is used.
 .Pp
 If the new domain has defined an initialization routine, it is called by
-.Fn net_add_domain ;
+.Fn domain_add ;
 as well, each of the protocols within the domain that have defined an
 initialization routine will have theirs called.
 .Pp

Modified: stable/9/sys/kern/uipc_domain.c
==============================================================================
--- stable/9/sys/kern/uipc_domain.c	Wed Jun 20 09:01:44 2012	(r237295)
+++ stable/9/sys/kern/uipc_domain.c	Wed Jun 20 09:38:35 2012	(r237296)
@@ -220,7 +220,7 @@ domain_add(void *data)
 	domains = dp;
 
 	KASSERT(domain_init_status >= 1,
-	    ("attempt to net_add_domain(%s) before domaininit()",
+	    ("attempt to domain_add(%s) before domaininit()",
 	    dp->dom_name));
 #ifndef INVARIANTS
 	if (domain_init_status < 1)