[Bug tui/30389] [gdb/tui] status line string longer than necessary

["simon.marchi at polymtl dot ca" <sourceware-bugzilla@sourceware.org>]

https://sourceware.org/bugzilla/show_bug.cgi?id=30389

Simon Marchi <simon.marchi at polymtl dot ca> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |simon.marchi at polymtl dot ca

--- Comment #2 from Simon Marchi <simon.marchi at polymtl dot ca> ---
(In reply to Tom de Vries from comment #1)
> Tentative patch:
> ...
> diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c
> index 0a750187c26..4769a7706d1 100644
> --- a/gdb/tui/tui-stack.c
> +++ b/gdb/tui/tui-stack.c
> @@ -183,10 +183,13 @@ tui_locator_window::make_status_line () const
>  
>    std::string string_val = string.release ();
>  
> -  if (string.size () < status_size)
> -    string_val.append (status_size - string.size (), ' ');
> -  else if (string.size () > status_size)
> -    string_val.erase (status_size, string.size ());
> +  size_t len = string_val.size ()
> +  if (len < status_size)
> +    string_val.append (status_size - len, ' ');
> +  else if (len > status_size)
> +    string_val.erase (status_size, len);
> +
> +  gdb_assert (string_val.size () == status_size);
>  
>    return string_val;
>  }
> ...

That looks good.  That's what you get when you use meaningless / generic
variable names :).

-- 
You are receiving this mail because:
You are on the CC list for the bug.