projects
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Error when gdb_is_target_1 is called without running gdb instance
[binutils-gdb.git]
/
gdb
/
xml-support.h
diff --git
a/gdb/xml-support.h
b/gdb/xml-support.h
index 5947623e5a41d4632da052ec14f84c38e26c1865..13edeaec9104a01996899f44daeb796d45d030e0 100644
(file)
--- a/
gdb/xml-support.h
+++ b/
gdb/xml-support.h
@@
-1,6
+1,6
@@
/* Helper routines for parsing XML using Expat.
/* Helper routines for parsing XML using Expat.
- Copyright (C) 2006-20
18
Free Software Foundation, Inc.
+ Copyright (C) 2006-20
22
Free Software Foundation, Inc.
This file is part of GDB.
This file is part of GDB.
@@
-21,9
+21,11
@@
#ifndef XML_SUPPORT_H
#define XML_SUPPORT_H
#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;
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);
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. */
/* 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
/* 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
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,
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. */
/* 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
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<cha
r> xml_fetch_content_from_file
- (const char *filename,
void *baton
);
+extern gdb::
optional<gdb::char_vecto
r> xml_fetch_content_from_file
+ (const char *filename,
const char *dirname
);
#endif
#endif