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/osdata.c | |
| 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/osdata.c')
| -rw-r--r-- | gdb/osdata.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gdb/osdata.c b/gdb/osdata.c index 9da3d07..276d224 100644 --- a/gdb/osdata.c +++ b/gdb/osdata.c @@ -245,13 +245,11 @@ struct osdata * get_osdata (const char *type) { struct osdata *osdata = NULL; - char *xml = target_get_osdata (type); + gdb::unique_xmalloc_ptr<char> xml = target_get_osdata (type); if (xml) { - struct cleanup *old_chain = make_cleanup (xfree, xml); - - if (xml[0] == '\0') + if (xml.get ()[0] == '\0') { if (type) warning (_("Empty data returned by target. Wrong osdata type?")); @@ -259,9 +257,7 @@ get_osdata (const char *type) warning (_("Empty type list returned by target. No type data?")); } else - osdata = osdata_parse (xml); - - do_cleanups (old_chain); + osdata = osdata_parse (xml.get ()); } if (!osdata) |