From: Pavel Charvat <pavel.charvat@netcentrum.cz>
Date: Sun, 20 Jan 2008 19:40:06 +0000 (+0100)
Subject: XML: Slighly changed parameters to the xml-test utility.
X-Git-Tag: holmes-import~469
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=90244efab23ff1f5f4843be03cf8ee7821330066;p=libucw.git

XML: Slighly changed parameters to the xml-test utility.
---

diff --git a/sherlock/xml/xml-test.c b/sherlock/xml/xml-test.c
index 186bdd2f..20df9788 100644
--- a/sherlock/xml/xml-test.c
+++ b/sherlock/xml/xml-test.c
@@ -19,7 +19,6 @@
 
 enum {
   WANT_FIRST = 0x100,
-  WANT_PARSE_DTD,
   WANT_HIDE_ERRORS,
   WANT_IGNORE_COMMENTS,
   WANT_IGNORE_PIS,
@@ -27,13 +26,13 @@ enum {
   WANT_FILE_ENTITIES,
 };
 
-static char *shortopts = "spd" CF_SHORT_OPTS;
+static char *shortopts = "spdt" CF_SHORT_OPTS;
 static struct option longopts[] = {
   CF_LONG_OPTS
   { "sax",		0, 0, 's' },
   { "pull",		0, 0, 'p' },
-  { "dom",		0, 0, 'd' },
-  { "dtd",		0, 0, WANT_PARSE_DTD },
+  { "dom",		0, 0, 't' },
+  { "dtd",		0, 0, 'd' },
   { "hide-errors",	0, 0, WANT_HIDE_ERRORS },
   { "ignore-comments",	0, 0, WANT_IGNORE_COMMENTS },
   { "ignore-pis",	0, 0, WANT_IGNORE_PIS },
@@ -240,10 +239,10 @@ main(int argc, char **argv)
 	case 'p':
 	  want_pull++;
 	  break;
-	case 'd':
+	case 't':
 	  want_dom++;
 	  break;
-	case WANT_PARSE_DTD:
+	case 'd':
 	  want_parse_dtd++;
 	  break;
 	case WANT_HIDE_ERRORS:
diff --git a/sherlock/xml/xml-test.t b/sherlock/xml/xml-test.t
index 9ca7d7dd..a7a8eb9d 100644
--- a/sherlock/xml/xml-test.t
+++ b/sherlock/xml/xml-test.t
@@ -22,7 +22,7 @@ Out:	PULL: start
 	SAX:  document_end
 	PULL: eof
 
-Run:	(printf '\376\377' && bin/cs2cs UTF-8 UTF-16BE) | ../obj/sherlock/xml/xml-test -spd --dtd
+Run:	(printf '\376\377' && bin/cs2cs UTF-8 UTF-16BE) | ../obj/sherlock/xml/xml-test -sptd
 In:	<?xml version="1.0"?>
 	<!DOCTYPE root [
 	<!ELEMENT root ANY>