From owner-p4-projects@FreeBSD.ORG  Sat Jan 26 12:07:38 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 074D716A419; Sat, 26 Jan 2008 12:07:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C0F9E16A417
	for <perforce@freebsd.org>; Sat, 26 Jan 2008 12:07:37 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B44E413C474
	for <perforce@freebsd.org>; Sat, 26 Jan 2008 12:07:37 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0QC7bZd079220
	for <perforce@freebsd.org>; Sat, 26 Jan 2008 12:07:37 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0QC7bfd079217
	for perforce@freebsd.org; Sat, 26 Jan 2008 12:07:37 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 26 Jan 2008 12:07:37 GMT
Message-Id: <200801261207.m0QC7bfd079217@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 134136 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: Sat, 26 Jan 2008 12:07:38 -0000

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

Change 134136 by rwatson@rwatson_freebsd_capabilities on 2008/01/26 12:07:36

	Move capenabled logic a bit higher in parseline() so that it also
	catches system calls with (void) arguments.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/makesyscalls.sh#3 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/makesyscalls.sh#3 (text+ko) ====

@@ -267,6 +267,20 @@
 		f++	#function return type
 
 		funcname=$f
+
+		#
+		# We now know the func name, so define a flags field for it.
+		# Do this before any other processing as we may return early
+		# from it.
+		#
+		# XXXRW: Surely we can just look it up in the array in awk?
+		#
+		for (cap in capenabled) {
+			if (funcname == capenabled[cap]) {
+				flags = "SYF_CAPENABLED";
+			}
+		}
+
 		if (funcalias == "")
 			funcalias = funcname
 		if (argalias == "") {
@@ -308,17 +322,6 @@
 		}
 		if (argc != 0)
 			argssize = "AS(" argalias ")"
-
-		#
-		# We now know the func name, so define a flags field for it.
-		#
-		# XXXRW: Surely we can just look it up in the array in awk?
-		#
-		for (cap in capenabled) {
-			if (funcname == capenabled[cap]) {
-				flags = "SYF_CAPENABLED";
-			}
-		}
 	}
 	{	comment = $4
 		if (NF < 7)