diff options
| author | Tom Tromey <tom@tromey.com> | 2017-11-22 23:37:38 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2018-03-07 15:36:28 -0700 |
| commit | e0d3522b888033febd153a4a7d3b7c5c13641f09 (patch) | |
| tree | 9c5c11152ba3b7202fac5dba1a9f21a35c85d3d5 /gdb/target.h | |
| parent | d6ab64818b9d212691c200c292dc0f18d193598c (diff) | |
| download | gdb-e0d3522b888033febd153a4a7d3b7c5c13641f09.zip gdb-e0d3522b888033febd153a4a7d3b7c5c13641f09.tar.gz gdb-e0d3522b888033febd153a4a7d3b7c5c13641f09.tar.bz2 | |
Return gdb::optional<std::string> from target_fileio_readlink
This changes to_fileio_readlink and target_fileio_readlink to return a
gdb::optional<std::sring>, and then fixes up the callers and
implementations. This allows the removal of some cleanups.
Regression tested by the buildbot.
gdb/ChangeLog
2018-03-07 Tom Tromey <tom@tromey.com>
* linux-tdep.c (linux_info_proc): Update.
* target.h (struct target_ops) <to_fileio_readlink>: Return
optional<string>.
(target_fileio_readlink): Return optional<string>.
* remote.c (remote_hostio_readlink): Return optional<string>.
* inf-child.c (inf_child_fileio_readlink): Return
optional<string>.
* target.c (target_fileio_readlink): Return optional<string>.
Diffstat (limited to 'gdb/target.h')
| -rw-r--r-- | gdb/target.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gdb/target.h b/gdb/target.h index de56213..fd6c30b 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -933,12 +933,12 @@ struct target_ops /* Read value of symbolic link FILENAME on the target, in the filesystem as seen by INF. If INF is NULL, use the filesystem seen by the debugger (GDB or, for remote targets, the remote - stub). Return a null-terminated string allocated via xmalloc, - or NULL if an error occurs (and set *TARGET_ERRNO). */ - char *(*to_fileio_readlink) (struct target_ops *, - struct inferior *inf, - const char *filename, - int *target_errno); + stub). Return a string, or an empty optional if an error + occurs (and set *TARGET_ERRNO). */ + gdb::optional<std::string> (*to_fileio_readlink) (struct target_ops *, + struct inferior *inf, + const char *filename, + int *target_errno); /* Implement the "info proc" command. */ @@ -2095,9 +2095,8 @@ extern int target_fileio_unlink (struct inferior *inf, by the debugger (GDB or, for remote targets, the remote stub). Return a null-terminated string allocated via xmalloc, or NULL if an error occurs (and set *TARGET_ERRNO). */ -extern char *target_fileio_readlink (struct inferior *inf, - const char *filename, - int *target_errno); +extern gdb::optional<std::string> target_fileio_readlink + (struct inferior *inf, const char *filename, int *target_errno); /* Read target file FILENAME, in the filesystem as seen by INF. If INF is NULL, use the filesystem seen by the debugger (GDB or, for |