#include "objfiles.h"
#include "symtab.h"
#include "xcoffread.h"
-#include "observer.h"
+#include "observable.h"
#include "gdbcmd.h"
/* Variable controlling the output of the debugging traces for
if (data->library_list != NULL)
return data->library_list;
- gdb::unique_xmalloc_ptr<char> library_document
- = target_read_stralloc (¤t_target, TARGET_OBJECT_LIBRARIES_AIX,
+ gdb::optional<gdb::char_vector> library_document
+ = target_read_stralloc (target_stack, TARGET_OBJECT_LIBRARIES_AIX,
NULL);
- if (library_document == NULL && warning_msg != NULL)
+ if (!library_document && warning_msg != NULL)
{
warning (_("%s (failed to read TARGET_OBJECT_LIBRARIES_AIX)"),
warning_msg);
if (solib_aix_debug)
fprintf_unfiltered (gdb_stdlog,
"DEBUG: TARGET_OBJECT_LIBRARIES_AIX = \n%s\n",
- library_document.get ());
+ library_document->data ());
- data->library_list = solib_aix_parse_libraries (library_document.get ());
+ data->library_list = solib_aix_parse_libraries (library_document->data ());
if (data->library_list == NULL && warning_msg != NULL)
{
warning (_("%s (missing XML support?)"), warning_msg);
/* Implement the "bfd_open" target_so_ops method. */
static gdb_bfd_ref_ptr
-solib_aix_bfd_open (char *pathname)
+solib_aix_bfd_open (const char *pathname)
{
/* The pathname is actually a synthetic filename with the following
form: "/path/to/sharedlib(member.o)" (double-quotes excluded).
FIXME: This is a little hacky. Perhaps we should provide access
to the solib's lm_info here? */
const int path_len = strlen (pathname);
- char *sep;
+ const char *sep;
int filename_len;
int found_file;
- char *found_pathname;
if (pathname[path_len - 1] != ')')
return solib_bfd_open (pathname);
/* Calling solib_find makes certain that sysroot path is set properly
if program has a dependency on .a archive and sysroot is set via
set sysroot command. */
- found_pathname = solib_find (filename.c_str (), &found_file);
+ gdb::unique_xmalloc_ptr<char> found_pathname
+ = solib_find (filename.c_str (), &found_file);
if (found_pathname == NULL)
perror_with_name (pathname);
- gdb_bfd_ref_ptr archive_bfd (solib_bfd_fopen (found_pathname, found_file));
+ gdb_bfd_ref_ptr archive_bfd (solib_bfd_fopen (found_pathname.get (),
+ found_file));
if (archive_bfd == NULL)
{
warning (_("Could not open `%s' as an executable file: %s"),
solib_aix_inferior_data_handle = register_inferior_data ();
- observer_attach_normal_stop (solib_aix_normal_stop_observer);
+ gdb::observers::normal_stop.attach (solib_aix_normal_stop_observer);
/* Debug this file's internals. */
add_setshow_boolean_cmd ("aix-solib", class_maintenance,