PERFORCE change 118194 for review

[Christian S.J. Peron]

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

Change 118194 by csjp at 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);
 	}