From owner-p4-projects@FreeBSD.ORG  Sat Jan 21 15:27:44 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 3A98516A422; Sat, 21 Jan 2006 15:27:44 +0000 (GMT)
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 F3A9916A41F
	for <perforce@freebsd.org>; Sat, 21 Jan 2006 15:27:43 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BCFBE43D46
	for <perforce@freebsd.org>; Sat, 21 Jan 2006 15:27:43 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0LFRh9k087319
	for <perforce@freebsd.org>; Sat, 21 Jan 2006 15:27:43 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0LFRhbL087316
	for perforce@freebsd.org; Sat, 21 Jan 2006 15:27:43 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 21 Jan 2006 15:27:43 GMT
Message-Id: <200601211527.k0LFRhbL087316@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 90092 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, 21 Jan 2006 15:27:45 -0000

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

Change 90092 by rwatson@rwatson_sesame on 2006/01/21 15:26:59

	Rename 'delim' to 'flagdelim' to match changes in other BSM
	related database code.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#9 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#9 (text+ko) ====

@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <string.h>
 
-static const char	*delim = ",";
+static const char	*flagdelim = ",";
 
 /*
  * Convert the character representation of audit values into the au_mask_t
@@ -65,7 +65,7 @@
 	masks->am_success = 0;
 	masks->am_failure = 0;
 
-	tok = strtok_r(auditstr, delim, &last);
+	tok = strtok_r(auditstr, flagdelim, &last);
 	while (tok != NULL) {
 		/* Check for the events that should not be audited. */
 		if (tok[0] == '^') {
@@ -95,7 +95,7 @@
 		}
 
 		/* Get the next class. */
-		tok = strtok_r(NULL, delim, &last);
+		tok = strtok_r(NULL, flagdelim, &last);
 	}
 	return (0);
 }