From owner-p4-projects@FreeBSD.ORG  Tue Aug 15 17:51:53 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3D8EE16A6B1; Tue, 15 Aug 2006 17:51:53 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 022FC16A666
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 17:51:52 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4A7CD43D69
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 17:51:34 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHpUEb036223
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 17:51:30 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHpUpN036220
	for perforce@freebsd.org; Tue, 15 Aug 2006 17:51:30 GMT
	(envelope-from millert@freebsd.org)
Date: Tue, 15 Aug 2006 17:51:30 GMT
Message-Id: <200608151751.k7FHpUpN036220@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 104072 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Aug 2006 17:51:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=104072

Change 104072 by millert@millert_macbook on 2006/08/15 17:50:45

	Use __func__ in error message instead of hard-coding the
	wrong thing (cut & pasto).  Also replace an instance of
	__FUNCTION__ (old gccism) with __func__ (c99).

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#2 (text+ko) ====

@@ -691,8 +691,8 @@
 		goto dosclass;
 	}
 	if (error) {
-		printf("sebsd_update_vnode_from_extattr: ERROR %d returned "
-		    " by mac_vnop_getxattr()\n", error);
+		printf("%s: ERROR %d returned by mac_vnop_getxattr()\n",
+		    __func__, error);
 		return (error); /* Fail closed */
 	}
 
@@ -702,8 +702,8 @@
 
 	error = security_context_to_sid(context, context_len, &vsec->sid);
 	if (error) {
-		printf("sebsd_update_vnode_from_extattr: ERROR mapping "
-		       "context to sid: %.*s\n", context_len, context);
+		printf("%s: ERROR mapping context to sid: %.*s\n",
+		    __func__, context_len, context);
 		return (0);	/* TBD bad, bad, bad */
 	}
 
@@ -1256,7 +1256,7 @@
 		break;
 	default:
 		printf("%s:  security_fs_use(%s) returned unrecognized "
-		    "behavior %d\n", __FUNCTION__, mp->mnt_vtable->vfc_name,
+		    "behavior %d\n", __func__, mp->mnt_vtable->vfc_name,
 		    behavior);
 		behavior = SECURITY_FS_USE_NONE;
 		break;