commit 6d889343710e0ecb14f87758608708e08df7c8c1
author Florian Fainelli <f.fainelli@gmail.com> Fri Jan 24 17:19:10 2014 -0800
committer David Gibson <david@gibson.dropbear.id.au> Sat Jan 25 15:11:20 2014 +1100
tree 3d532aa7fdcbb535e94315643a927f2eec3cf7d4
parent fa3f3f0ebd154b0ef22cb83cd8efc50b7bbe181d

dtc: avoid shadowing dirname()

dirname() is declared as a function, and later on try_open() another
variable dirname is used, which shadows the dirname() function
declaration and will produce the following warnings/errors with
-Wshadow turned on:

srcpos.c: In function 'try_open':
srcpos.c:71:35: error: declaration of 'dirname' shadows a global
declaration [-Werror=shadow]
srcpos.c:37:14: error: shadowed declaration is here [-Werror=shadow]
srcpos.c: In function 'srcfile_add_search_path':
srcpos.c:183:42: error: declaration of 'dirname' shadows a global
declaration [-Werror=shadow]
srcpos.c:37:14: error: shadowed declaration is here [-Werror=shadow]
cc1: all warnings being treated as errors

Fix this by renaming the function dirname() to get_dirname().

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

srcpos.c

diff --git a/srcpos.c b/srcpos.c
index 3999675..4549773 100644
--- a/srcpos.c
+++ b/srcpos.c
@@ -34,7 +34,7 @@
 static struct search_path *search_path_head, **search_path_tail;
 
 
-static char *dirname(const char *path)
+static char *get_dirname(const char *path)
 {
 	const char *slash = strrchr(path, '/');
 
@@ -150,7 +150,7 @@
 	srcfile = xmalloc(sizeof(*srcfile));
 
 	srcfile->f = srcfile_relative_open(fname, &srcfile->name);
-	srcfile->dir = dirname(srcfile->name);
+	srcfile->dir = get_dirname(srcfile->name);
 	srcfile->prev = current_srcfile;
 
 	srcfile->lineno = 1;