diff options
| author | Tom Tromey <tom@tromey.com> | 2017-10-12 16:48:35 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-10-16 16:10:21 -0600 |
| commit | b7b030adc405017f01e996a90f85e40730ef8397 (patch) | |
| tree | 5d6fdf82c43f719834633295cbcde80f75d5663d /gdb/xml-support.h | |
| parent | b80406accc70791a1789e40f24d64161bc41de34 (diff) | |
| download | gdb-b7b030adc405017f01e996a90f85e40730ef8397.zip gdb-b7b030adc405017f01e996a90f85e40730ef8397.tar.gz gdb-b7b030adc405017f01e996a90f85e40730ef8397.tar.bz2 | |
Return unique_xmalloc_ptr from target_read_stralloc
This changes target_read_stralloc to return a unique_xmalloc_ptr, and
then fixes all the callers. unique_xmalloc_ptr is used, rather than
std::string, because target_read_stralloc gives a special meaning to a
NULL return.
ChangeLog
2017-10-16 Tom Tromey <tom@tromey.com>
* xml-syscall.c (xml_init_syscalls_info): Update.
* xml-support.c (xinclude_start_include): Update.
(xml_fetch_content_from_file): Return unique_xmalloc_ptr.
* xml-support.h (xml_fetch_another): Return unique_xmalloc_ptr.
(xml_fetch_content_from_file): Likewise.
* osdata.c (get_osdata): Update.
* target.h (target_read_stralloc, target_get_osdata): Return
unique_xmalloc_ptr.
* solib-aix.c (solib_aix_get_library_list): Update.
* solib-target.c (solib_target_current_sos): Update.
* solib-svr4.c (svr4_current_sos_via_xfer_libraries): Update.
* xml-tdesc.c (fetch_available_features_from_target): Update.
(target_fetch_description_xml): Update.
(file_read_description_xml): Update.
* remote.c (remote_get_threads_with_qxfer, remote_memory_map)
(remote_traceframe_info, btrace_read_config, remote_read_btrace)
(remote_pid_to_exec_file): Update.
* target.c (target_read_stralloc): Return unique_xmalloc_ptr.
(target_get_osdata): Likewise.
Diffstat (limited to 'gdb/xml-support.h')
| -rw-r--r-- | gdb/xml-support.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gdb/xml-support.h b/gdb/xml-support.h index 1a1b7fd..74bc811 100644 --- a/gdb/xml-support.h +++ b/gdb/xml-support.h @@ -52,7 +52,8 @@ extern const char *xml_builtin[][2]; /* Callback to fetch a new XML file, based on the provided HREF. */ -typedef char *(*xml_fetch_another) (const char *href, void *baton); +typedef gdb::unique_xmalloc_ptr<char> (*xml_fetch_another) (const char *href, + void *baton); /* Append the expansion of TEXT after processing <xi:include> tags in RESULT. FETCHER will be called (with FETCHER_BATON) to retrieve @@ -230,7 +231,7 @@ ULONGEST gdb_xml_parse_ulongest (struct gdb_xml_parser *parser, /* Open FILENAME, read all its text into memory, close it, and return the text. If something goes wrong, return NULL and warn. */ -extern char *xml_fetch_content_from_file (const char *filename, - void *baton); +extern gdb::unique_xmalloc_ptr<char> xml_fetch_content_from_file + (const char *filename, void *baton); #endif |