Fix library-list.dtd -> library-list-svr4.dtd

Message ID 20140927182859.GA21940@host2.jankratochvil.net
State New, archived
Headers

Commit Message

Jan Kratochvil Sept. 27, 2014, 6:28 p.m. UTC
  Hi,

commit 2268b414f486239cbcc0f756f157c3e03599efac
added file "features/library-list-svr4.dtd" but the added code uses
"library-list.dtd" instead.

Curiously after changing for a test s/name/nXme/ in the DTD making the
gdbserver output non-conforming there is no warning or regression seen (tested
gdb.base/shlib-call.exp, using_xfer is still 1).  I did not check more why the
DTD conformance verification does not work.

No regressions on {x86_64,x86_64-m32,i686}-fedora21pre-linux-gnu in gdbserver
mode.


Jan
gdb/
2014-09-27  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* solib-svr4.c (svr4_parse_libraries): Use "library-list-svr4.dtd".
  

Comments

Pedro Alves Sept. 29, 2014, 3:34 p.m. UTC | #1
On 09/27/2014 07:28 PM, Jan Kratochvil wrote:

> gdb/
> 2014-09-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
> 
> 	* solib-svr4.c (svr4_parse_libraries): Use "library-list-svr4.dtd".

OK.

Thanks,
Pedro Alves
  
Jan Kratochvil Sept. 29, 2014, 3:39 p.m. UTC | #2
On Mon, 29 Sep 2014 17:34:39 +0200, Pedro Alves wrote:
> On 09/27/2014 07:28 PM, Jan Kratochvil wrote:
> > gdb/
> > 2014-09-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
> > 
> > 	* solib-svr4.c (svr4_parse_libraries): Use "library-list-svr4.dtd".
> 
> OK.

Checked in:
	2eca4a8d84ce27d0768702e93b8fca1578f84d06


Jan
  
Pedro Alves Sept. 29, 2014, 4:15 p.m. UTC | #3
On 09/27/2014 07:28 PM, Jan Kratochvil wrote:

> I did not check more why the DTD conformance verification does not work.

Oh, the answer here is that expat is not a validating parser.

Thanks,
Pedro Alves
  

Patch

diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index 3deef20..978564c 100644
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -1209,7 +1209,7 @@  svr4_parse_libraries (const char *document, struct svr4_library_list *list)
 
   memset (list, 0, sizeof (*list));
   list->tailp = &list->head;
-  if (gdb_xml_parse_quick (_("target library list"), "library-list.dtd",
+  if (gdb_xml_parse_quick (_("target library list"), "library-list-svr4.dtd",
 			   svr4_library_list_elements, document, list) == 0)
     {
       /* Parsed successfully, keep the result.  */