diff options
| author | Tom Tromey <tom@tromey.com> | 2019-09-01 08:13:24 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-09-20 13:49:10 -0600 |
| commit | 9923f347c4e4b9ed710de3404444cf46b04135a0 (patch) | |
| tree | de2f72d590b7b6636aca60b859a6166b61efbb5d /gdb/tui/tui-stack.c | |
| parent | b76251abaf279603367ae730b9194fb20861fdb9 (diff) | |
| download | fsf-binutils-gdb-9923f347c4e4b9ed710de3404444cf46b04135a0.zip fsf-binutils-gdb-9923f347c4e4b9ed710de3404444cf46b04135a0.tar.gz fsf-binutils-gdb-9923f347c4e4b9ed710de3404444cf46b04135a0.tar.bz2 | |
Change members of tui_locator_window to std::string
This changes two members of tui_locator_window to have type
std::string. This removes a static limit.
gdb/ChangeLog
2019-09-20 Tom Tromey <tom@tromey.com>
* tui/tui-stack.h (MAX_LOCATOR_ELEMENT_LEN): Remove define.
(struct tui_locator_window) <full_name, proc_name>: Now
std::string.
* tui/tui-stack.c (tui_locator_window::make_status_line)
(tui_locator_window::set_locator_fullname)
(tui_locator_window::set_locator_info): Update.
* tui/tui-source.c (tui_source_window::set_contents)
(tui_source_window::showing_source_p): Update.
Diffstat (limited to 'gdb/tui/tui-stack.c')
| -rw-r--r-- | gdb/tui/tui-stack.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c index 8301879..d66e358 100644 --- a/gdb/tui/tui-stack.c +++ b/gdb/tui/tui-stack.c @@ -166,12 +166,12 @@ tui_locator_window::make_status_line () const /* Procedure/class name. */ if (proc_width > 0) { - if (strlen (proc_name) > proc_width) + if (proc_name.size () > proc_width) string.printf ("%s%*.*s* ", PROC_PREFIX, - 1 - proc_width, proc_width - 1, proc_name); + 1 - proc_width, proc_width - 1, proc_name.c_str ()); else string.printf ("%s%*.*s ", PROC_PREFIX, - -proc_width, proc_width, proc_name); + -proc_width, proc_width, proc_name.c_str ()); } if (line_width > 0) @@ -250,8 +250,7 @@ tui_locator_window::rerender () void tui_locator_window::set_locator_fullname (const char *fullname) { - full_name[0] = 0; - strcat_to_buf (full_name, MAX_LOCATOR_ELEMENT_LEN, fullname); + full_name = fullname; rerender (); } @@ -272,16 +271,13 @@ tui_locator_window::set_locator_info (struct gdbarch *gdbarch_in, if (fullname == NULL) fullname = ""; - locator_changed_p |= strncmp (proc_name, procname, - MAX_LOCATOR_ELEMENT_LEN) != 0; + locator_changed_p |= proc_name != procname; locator_changed_p |= lineno != line_no; locator_changed_p |= addr_in != addr; locator_changed_p |= gdbarch_in != gdbarch; - locator_changed_p |= strncmp (full_name, fullname, - MAX_LOCATOR_ELEMENT_LEN) != 0; + locator_changed_p |= full_name != fullname; - proc_name[0] = (char) 0; - strcat_to_buf (proc_name, MAX_LOCATOR_ELEMENT_LEN, procname); + proc_name = procname; line_no = lineno; addr = addr_in; gdbarch = gdbarch_in; |