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

diff --git a/sherlock/xml/xml-test.c b/sherlock/xml/xml-test.c
index 186bdd2f58f910b915225f89aa6be73d735ea86f..20df9788ff64996d7101c12cbbc1bf758bf5739e 100644 (file)
--- 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 9ca7d7dd44e61833a8f6acc257855b881311da83..a7a8eb9d15c252f56decd2ec88f83d0a15e81293 100644 (file)
--- 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>