X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Fxml-support.h;h=13edeaec9104a01996899f44daeb796d45d030e0;hb=ea764154c27a11619ba764a4c92f395ba5007234;hp=5947623e5a41d4632da052ec14f84c38e26c1865;hpb=4d0fdd9b357aff1fea3ef3def55d12464a41bf5b;p=binutils-gdb.git

diff --git a/gdb/xml-support.h b/gdb/xml-support.h
index 5947623e5a4..13edeaec910 100644
--- a/gdb/xml-support.h
+++ b/gdb/xml-support.h
@@ -1,6 +1,6 @@
 /* Helper routines for parsing XML using Expat.
 
-   Copyright (C) 2006-2018 Free Software Foundation, Inc.
+   Copyright (C) 2006-2022 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -21,9 +21,11 @@
 #ifndef XML_SUPPORT_H
 #define XML_SUPPORT_H
 
-#include "gdb_obstack.h"
-#include "vec.h"
-#include "xml-utils.h"
+#include "gdbsupport/gdb_obstack.h"
+#include "gdbsupport/xml-utils.h"
+#include "gdbsupport/byte-vector.h"
+#include "gdbsupport/gdb_optional.h"
+#include "gdbsupport/function-view.h"
 
 struct gdb_xml_parser;
 struct gdb_xml_element;
@@ -43,21 +45,16 @@ LONGEST xml_builtin_xfer_partial (const char *filename,
 				  gdb_byte *readbuf, const gdb_byte *writebuf,
 				  ULONGEST offset, LONGEST len);
 
-/* The text of compiled-in XML documents, from xml-builtin.c
-   (generated).  */
-
-extern const char *xml_builtin[][2];
-
 /* Support for XInclude.  */
 
 /* Callback to fetch a new XML file, based on the provided HREF.  */
 
-typedef gdb::unique_xmalloc_ptr<char> (*xml_fetch_another) (const char *href,
-							    void *baton);
+using xml_fetch_another = gdb::function_view<gdb::optional<gdb::char_vector>
+					     (const char * /* href */)>;
 
 /* Append the expansion of TEXT after processing <xi:include> tags in
-   RESULT.  FETCHER will be called (with FETCHER_BATON) to retrieve
-   any new files.  DEPTH should be zero on the initial call.
+   RESULT.  FETCHER will be called to retrieve any new files.  DEPTH
+   should be zero on the initial call.
 
    On failure, this function uses NAME in a warning and returns false.
    It may throw an exception, but does not for XML parsing
@@ -65,8 +62,7 @@ typedef gdb::unique_xmalloc_ptr<char> (*xml_fetch_another) (const char *href,
 
 bool xml_process_xincludes (std::string &result,
 			    const char *name, const char *text,
-			    xml_fetch_another fetcher, void *fetcher_baton,
-			    int depth);
+			    xml_fetch_another fetcher, int depth);
 
 /* Simplified XML parser infrastructure.  */
 
@@ -231,9 +227,10 @@ ULONGEST gdb_xml_parse_ulongest (struct gdb_xml_parser *parser,
 				 const char *value);
 
 /* Open FILENAME, read all its text into memory, close it, and return
-   the text.  If something goes wrong, return NULL and warn.  */
+   the text.  If something goes wrong, return an uninstantiated optional
+   and warn.  */
 
-extern gdb::unique_xmalloc_ptr<char> xml_fetch_content_from_file
-    (const char *filename, void *baton);
+extern gdb::optional<gdb::char_vector> xml_fetch_content_from_file
+    (const char *filename, const char *dirname);
 
 #endif