aboutsummaryrefslogtreecommitdiff
path: root/bfd/dwarf2.c
diff options
context:
space:
mode:
authorJoel Brobecker <brobecker@gnat.com>2010-01-04 11:44:30 +0000
committerJoel Brobecker <brobecker@gnat.com>2010-01-04 11:44:30 +0000
commit608fa8d35d1995a3366c901e8b754aacfab6ccc3 (patch)
treee6fc07a2254833c979f4d5e8b40056ca0cdbe71d /bfd/dwarf2.c
parent619c8a7d09733aaf4116e4fbb13ad2598c13c555 (diff)
downloadgdb-608fa8d35d1995a3366c901e8b754aacfab6ccc3.zip
gdb-608fa8d35d1995a3366c901e8b754aacfab6ccc3.tar.gz
gdb-608fa8d35d1995a3366c901e8b754aacfab6ccc3.tar.bz2
Fix -Wshadow warnings in dwarf2.c (seen on alpha-tru64).
* dwarf2.c (concat_filename): Rename dirname with dir_name to void shadowing the dirname function. Rename subdirname with subdir_name to stay consistent with the new dir_name variable name.
Diffstat (limited to 'bfd/dwarf2.c')
-rw-r--r--bfd/dwarf2.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
index 0e875a1..e5eccfc 100644
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -1109,40 +1109,40 @@ concat_filename (struct line_info_table *table, unsigned int file)
if (!IS_ABSOLUTE_PATH (filename))
{
- char *dirname = NULL;
- char *subdirname = NULL;
+ char *dir_name = NULL;
+ char *subdir_name = NULL;
char *name;
size_t len;
if (table->files[file - 1].dir)
- subdirname = table->dirs[table->files[file - 1].dir - 1];
+ subdir_name = table->dirs[table->files[file - 1].dir - 1];
- if (!subdirname || !IS_ABSOLUTE_PATH (subdirname))
- dirname = table->comp_dir;
+ if (!subdir_name || !IS_ABSOLUTE_PATH (subdir_name))
+ dir_name = table->comp_dir;
- if (!dirname)
+ if (!dir_name)
{
- dirname = subdirname;
- subdirname = NULL;
+ dir_name = subdir_name;
+ subdir_name = NULL;
}
- if (!dirname)
+ if (!dir_name)
return strdup (filename);
- len = strlen (dirname) + strlen (filename) + 2;
+ len = strlen (dir_name) + strlen (filename) + 2;
- if (subdirname)
+ if (subdir_name)
{
- len += strlen (subdirname) + 1;
+ len += strlen (subdir_name) + 1;
name = (char *) bfd_malloc (len);
if (name)
- sprintf (name, "%s/%s/%s", dirname, subdirname, filename);
+ sprintf (name, "%s/%s/%s", dir_name, subdir_name, filename);
}
else
{
name = (char *) bfd_malloc (len);
if (name)
- sprintf (name, "%s/%s", dirname, filename);
+ sprintf (name, "%s/%s", dir_name, filename);
}
return name;