From owner-p4-projects@FreeBSD.ORG  Sun Apr 15 18:55:21 2007
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 2B73E16A414; Sun, 15 Apr 2007 18:55:21 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 01A4816A412
	for <perforce@freebsd.org>; Sun, 15 Apr 2007 18:55:21 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id E63E513C4BA
	for <perforce@freebsd.org>; Sun, 15 Apr 2007 18:55:20 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3FItKBw093191
	for <perforce@freebsd.org>; Sun, 15 Apr 2007 18:55:20 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3FItKD0093180
	for perforce@freebsd.org; Sun, 15 Apr 2007 18:55:20 GMT
	(envelope-from csjp@freebsd.org)
Date: Sun, 15 Apr 2007 18:55:20 GMT
Message-Id: <200704151855.l3FItKD0093180@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 118194 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: Sun, 15 Apr 2007 18:55:21 -0000

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

Change 118194 by csjp@csjp_xor on 2007/04/15 18:54:41

	add XML support for zone name token
	<zone name="ZoneName" />

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#47 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#47 (text+ko) ====

@@ -32,7 +32,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#46 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#47 $
  */
 
 #include <sys/types.h>
@@ -392,6 +392,10 @@
 	case AUT_DATA:
 		fprintf(fp, "</arbitrary>");
 		break;
+
+	case AUT_ZONENAME:
+		fprintf(fp, "/>");
+		break;
 	}
 }
 
@@ -559,6 +563,10 @@
 		case AUT_DATA:
 			fprintf(fp, "<arbitrary ");
 			break;
+
+		case AUT_ZONENAME:
+			fprintf(fp, "<zone ");
+			break;
 		}
 	} else {
 		if (raw)
@@ -3885,8 +3893,17 @@
 {
 
 	print_tok_type(fp, tok->id, "zone", raw, xml);
-	print_delim(fp, del);
-	print_string(fp, tok->tt.zonename.zonename, tok->tt.zonename.len);
+	if (xml) {
+		open_attr(fp, "name");
+		print_string(fp, tok->tt.zonename.zonename,
+		    tok->tt.zonename.len);
+		close_attr(fp);
+		close_tag(fp, tok->id);
+	} else {
+		print_delim(fp, del);
+		print_string(fp, tok->tt.zonename.zonename,
+		    tok->tt.zonename.len);
+	}
 }
 
 /*
@@ -4367,6 +4384,10 @@
 		print_socketex32_tok(outfp, tok, del, raw, sfrm, AU_XML);
 		return;
 
+	case AUT_ZONENAME:
+		print_zonename_tok(outfp, tok, del, raw, sfrm, AU_XML);
+		return;
+
 	default:
 		print_invalid_tok(outfp, tok, del, raw, sfrm, AU_XML);
 	}