FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove two cleanups using std::string

Browse source 
This patches removes cleanups from a couple of spots by using
std::string rather than manual memory management.

Regression tested by the buildbot, though note that I don't believe
the buildbot actually exercises the machoread code.

gdb/ChangeLog
2018-03-13  Tom Tromey  <tom@tromey.com>

	* machoread.c (macho_check_dsym): Change filenamep to a
	std::string*.
	(macho_symfile_read): Update.
	* symfile.c (load_command): Use std::string.
This commit is contained in:
Tom Tromey 2018-02-22 16:31:15 -07:00
parent e45ad1239d
commit b577b6af8e
3 changed files with 26 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

44
gdb/symfile.c
View file

@ -1789,8 +1789,6 @@ find_sym_fns (bfd *abfd)
static void
load_command (const char *arg, int from_tty)
{
struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
dont_repeat ();
/* The user might be reloading because the binary has changed. Take
@ -1798,40 +1796,28 @@ load_command (const char *arg, int from_tty)
reopen_exec_file ();
reread_symbols ();
std::string temp;
if (arg == NULL)
{
const char *parg;
int count = 0;
const char *parg, *prev;
parg = arg = get_exec_file (1);
arg = get_exec_file (1);
/* Count how many \ " ' tab space there are in the name. */
/* We may need to quote this string so buildargv can pull it
apart. */
prev = parg = arg;
while ((parg = strpbrk (parg, "\\\"'\t ")))
{
parg++;
count++;
temp.append (prev, parg - prev);
prev = parg++;
temp.push_back ('\\');
}
if (count)
/* If we have not copied anything yet, then we didn't see a
character to quote, and we can just leave ARG unchanged. */
if (!temp.empty ())
{
/* We need to quote this string so buildargv can pull it apart. */
char *temp = (char *) xmalloc (strlen (arg) + count + 1 );
char *ptemp = temp;
const char *prev;
make_cleanup (xfree, temp);
prev = parg = arg;
while ((parg = strpbrk (parg, "\\\"'\t ")))
{
strncpy (ptemp, prev, parg - prev);
ptemp += parg - prev;
prev = parg++;
*ptemp++ = '\\';
}
strcpy (ptemp, prev);
arg = temp;
temp.append (prev);
arg = temp.c_str ();
}
}
@ -1840,8 +1826,6 @@ load_command (const char *arg, int from_tty)
/* After re-loading the executable, we don't really know which
overlays are mapped any more. */
overlay_cache_invalid = 1;
do_cleanups (cleanup);
}
/* This version of "load" should be usable for any target. Currently