OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove use of concat() inside concat_filename()

This commit is contained in:
Nick Clifton 2003-04-01 10:18:54 +00:00
parent a6e028719a
commit af3ef9fe5c
2 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2003-04-01 Nick Clifton <nickc@redhat.com>
* dwarf2.c (concat_filename): Use bfd_malloc() and strdup()
instead of concat().
(decode_line_info): Only free filename if it is not NULL.
2003-03-31 Andreas Schwab <schwab@suse.de>
Daniel Jacobowitz <drow@mvista.com>

45
bfd/dwarf2.c
View File

@ -817,11 +817,11 @@ struct funcinfo
bfd_vma high;
};
/* add_line_info: adds a new entry to the line_info list in the
line_info_table, ensuring that the list is sorted. Note that the
line_info list is sorted from highest to lowest VMA (with possible
duplicates); that is, line_info->prev_line always accesses an equal
or smaller VMA. */
/* Adds a new entry to the line_info list in the line_info_table, ensuring
that the list is sorted. Note that the line_info list is sorted from
highest to lowest VMA (with possible duplicates); that is,
line_info->prev_line always accesses an equal or smaller VMA. */
static void
add_line_info (table, address, filename, line, column, end_sequence)
struct line_info_table* table;
@ -908,7 +908,8 @@ add_line_info (table, address, filename, line, column, end_sequence)
}
/* Extract a fully qualified filename from a line info table.
The returned string has been xmalloc'ed. */
The returned string has been malloc'ed and it is the caller's
responsibility to free it. */
static char *
concat_filename (table, file)
@ -921,26 +922,32 @@ concat_filename (table, file)
{
(*_bfd_error_handler)
(_("Dwarf Error: mangled line number section (bad file number)."));
return concat ("<unknown>");
return strdup ("<unknown>");
}
filename = table->files[file - 1].name;
if (IS_ABSOLUTE_PATH (filename))
return concat (filename);
else
if (! IS_ABSOLUTE_PATH (filename))
{
char* dirname = (table->files[file - 1].dir
? table->dirs[table->files[file - 1].dir - 1]
: table->comp_dir);
/* Not all tools set DW_AT_comp_dir, so dirname may be unknown. The
best we can do is return the filename part. */
if (dirname == NULL)
return concat (filename);
else
return concat (dirname, "/", filename, NULL);
/* Not all tools set DW_AT_comp_dir, so dirname may be unknown.
The best we can do is return the filename part. */
if (dirname != NULL)
{
unsigned int len = strlen (dirname) + strlen (filename) + 2;
char * name;
name = bfd_malloc (len);
if (name)
sprintf (name, "%s/%s", dirname, filename);
return name;
}
}
return strdup (filename);
}
static void
@ -1266,7 +1273,8 @@ decode_line_info (unit, stash)
based, the references are 1 based. */
file = read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
line_ptr += bytes_read;
free (filename);
if (filename)
free (filename);
filename = concat_filename (table, file);
break;
}
@ -1302,7 +1310,8 @@ decode_line_info (unit, stash)
}
}
free (filename);
if (filename)
free (filename);
}
return table;