From nobody@FreeBSD.org  Thu Feb 23 16:30:39 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C68A7106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 23 Feb 2012 16:30:39 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id B1BE08FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 23 Feb 2012 16:30:39 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q1NGUdht006216
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 23 Feb 2012 16:30:39 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q1NGUdft006215;
	Thu, 23 Feb 2012 16:30:39 GMT
	(envelope-from nobody)
Message-Id: <201202231630.q1NGUdft006215@red.freebsd.org>
Date: Thu, 23 Feb 2012 16:30:39 GMT
From: Lachlan Kang <LCRTRIfFu91c710azO2Y@live.co.uk>
To: freebsd-gnats-submit@FreeBSD.org
Subject: domain(9) refers to renamed function
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         165424
>Category:       docs
>Synopsis:       domain(9) refers to renamed function
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    brueffer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 23 16:40:10 UTC 2012
>Closed-Date:    Wed Jun 20 12:59:47 CEST 2012
>Last-Modified:  Wed Jun 20 12:59:47 CEST 2012
>Originator:     Lachlan Kang
>Release:        FreeBSD 9.0-RELEASE
>Organization:
>Environment:
>Description:
A function called net_add_domain was renamed to domain_add.
The man page domain(9) has not been updated to reflect this and still refers to net_add_domain.
The function in question can be found in /sys/kern/uipc_domain.c and seems to have been renamed sometime around FreeBSD 8.0.

Also, a KASSERT message in domain_add's code still refers to net_add_domain. (Should I submit a separate bug report for that?)
>How-To-Repeat:
man 9 domain
>Fix:
Replace references to net_add_domain with domain_add

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: brueffer 
State-Changed-When: Thu Feb 23 18:47:42 CET 2012 
State-Changed-Why:  
Fixed, thanks! 


Responsible-Changed-From-To: freebsd-doc->brueffer 
Responsible-Changed-By: brueffer 
Responsible-Changed-When: Thu Feb 23 18:47:42 CET 2012 
Responsible-Changed-Why:  
MFC reminder. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=165424 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/165424: commit references a PR
Date: Thu, 23 Feb 2012 17:47:35 +0000 (UTC)

 Author: brueffer
 Date: Thu Feb 23 17:47:19 2012
 New Revision: 232051
 URL: http://svn.freebsd.org/changeset/base/232051
 
 Log:
   Catch up with r195837 (2.5 years ago) which renamed net_add_domain() to domain_add().
   
   PR:		165424
   Submitted by:	Lachlan Kang
   MFC after:	1 week
 
 Modified:
   head/ObsoleteFiles.inc
   head/share/man/man9/Makefile
   head/share/man/man9/domain.9
   head/sys/kern/uipc_domain.c
 
 Modified: head/ObsoleteFiles.inc
 ==============================================================================
 --- head/ObsoleteFiles.inc	Thu Feb 23 16:47:05 2012	(r232050)
 +++ head/ObsoleteFiles.inc	Thu Feb 23 17:47:19 2012	(r232051)
 @@ -707,6 +707,8 @@ OLD_LIBS+=usr/lib32/pam_unix.so.4
  .endif
  # 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: head/share/man/man9/Makefile
 ==============================================================================
 --- head/share/man/man9/Makefile	Thu Feb 23 16:47:05 2012	(r232050)
 +++ head/share/man/man9/Makefile	Thu Feb 23 17:47:19 2012	(r232051)
 @@ -615,7 +615,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: head/share/man/man9/domain.9
 ==============================================================================
 --- head/share/man/man9/domain.9	Thu Feb 23 16:47:05 2012	(r232050)
 +++ head/share/man/man9/domain.9	Thu Feb 23 17:47:19 2012	(r232051)
 @@ -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: head/sys/kern/uipc_domain.c
 ==============================================================================
 --- head/sys/kern/uipc_domain.c	Thu Feb 23 16:47:05 2012	(r232050)
 +++ head/sys/kern/uipc_domain.c	Thu Feb 23 17:47:19 2012	(r232051)
 @@ -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)
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: brueffer 
State-Changed-When: Wed Jun 20 12:59:28 CEST 2012 
State-Changed-Why:  
MFCs done. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=165424 
>Unformatted:
