diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-25 20:32:13 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-25 20:32:13 +0000 |
| commit | e1a41bb4cf3a79b4a9ba59e9a57e2cf301ee48cb (patch) | |
| tree | d06df64af7ce75f780e68f4cc7406033eeed03b0 | |
| parent | ec0a1e0f3585a6da0fd94a60cb09e78779c4da2a (diff) | |
| download | ATCD-e1a41bb4cf3a79b4a9ba59e9a57e2cf301ee48cb.tar.gz | |
ChangeLogTag:Fri Jan 25 14:31:06 2002 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | ACEXML/common/NamespaceSupport.cpp | 3 | ||||
| -rw-r--r-- | ACEXML/parser/parser/Parser.cpp | 15 | ||||
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 |
5 files changed, 29 insertions, 4 deletions
diff --git a/ACEXML/common/NamespaceSupport.cpp b/ACEXML/common/NamespaceSupport.cpp index 949c265eacb..dc5e1ecc825 100644 --- a/ACEXML/common/NamespaceSupport.cpp +++ b/ACEXML/common/NamespaceSupport.cpp @@ -11,7 +11,8 @@ const ACEXML_Char *ACEXML_NamespaceSupport::XMLNS_PREFIX = ACEXML_XMLNS_PREFIX_n static const ACEXML_Char ACEXML_DEFAULT_NS_PREFIX[] = {0}; -static const ACEXML_Char ACEXML_NS_SEPARATOR[] = {':', 0}; +// Currently unused. +// static const ACEXML_Char ACEXML_NS_SEPARATOR[] = {':', 0}; static const ACEXML_Char ACEXML_TABOO_NS_PREFIX[] = {'x', 'm', 'l', 0}; diff --git a/ACEXML/parser/parser/Parser.cpp b/ACEXML/parser/parser/Parser.cpp index baf7de05ac4..d3fa5092966 100644 --- a/ACEXML/parser/parser/Parser.cpp +++ b/ACEXML/parser/parser/Parser.cpp @@ -305,7 +305,14 @@ ACEXML_Parser::parse_xml_prolog (ACEXML_Env &xmlenv) this->skip_equal () == 0 && this->get_quoted_string (astring) == 0) { - seen_encoding = 1; + if (seen_encoding) + { + xmlenv.exception (new ACEXML_SAXParseException + (ACE_LIB_TEXT ("Duplicate encoding defined"))); + return; + } + else + seen_encoding = 1; // @@ Handle encoding here. We don't handle // various encodings for this parser. @@ -662,6 +669,8 @@ ACEXML_Parser::parse_element (int is_root, ACEXML_Env &xmlenv) xmlns_prefix = ns_att.next (); ns_name = ns_att.next (); + // @@ xmlns_prefix is not used now. + ACE_UNUSED_ARG (xmlns_prefix); if (ns_name == 0) { // @@ Check return value? @@ -936,7 +945,7 @@ ACEXML_Parser::parse_char_reference (ACEXML_Char *buf, size_t len) } more_digit = 1; } - return -1; + ACE_NOTREACHED (return -1;) } const ACEXML_String * @@ -1705,7 +1714,7 @@ ACEXML_Parser::parse_attlist_decl (ACEXML_Env &xmlenv) (ACE_LIB_TEXT ("Invalid Attribute Type while defining ATTLIST."))); return -1; } - break; + ACE_NOTREACHED (break;) } /* diff --git a/ChangeLog b/ChangeLog index b9f557653b3..1fc875b34e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jan 25 14:31:06 2002 Nanbor Wang <nanbor@cs.wustl.edu> + + * XML/common/NamespaceSupport.cpp: + * XML/parser/parser/Parser.cpp: Fixed several KCC warnings. + Fri Jan 25 12:01:14 2002 Nanbor Wang <nanbor@cs.wustl.edu> The following changes fixed SunCC5.1 compilation errors. diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index b9f557653b3..1fc875b34e4 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Fri Jan 25 14:31:06 2002 Nanbor Wang <nanbor@cs.wustl.edu> + + * XML/common/NamespaceSupport.cpp: + * XML/parser/parser/Parser.cpp: Fixed several KCC warnings. + Fri Jan 25 12:01:14 2002 Nanbor Wang <nanbor@cs.wustl.edu> The following changes fixed SunCC5.1 compilation errors. diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index b9f557653b3..1fc875b34e4 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Fri Jan 25 14:31:06 2002 Nanbor Wang <nanbor@cs.wustl.edu> + + * XML/common/NamespaceSupport.cpp: + * XML/parser/parser/Parser.cpp: Fixed several KCC warnings. + Fri Jan 25 12:01:14 2002 Nanbor Wang <nanbor@cs.wustl.edu> The following changes fixed SunCC5.1 compilation errors. |