aboutsummaryrefslogtreecommitdiff
path: root/util.c
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2014-02-01 16:41:59 +1100
committerDavid Gibson <david@gibson.dropbear.id.au>2014-02-01 16:48:19 +1100
commit24cb3d0681d9196d57176a0a94bfc6e610ef7b45 (patch)
tree9632917fb8fc895aa554d7b9a4eeeb5f221aa36f /util.c
parentc231d94e0f620bc25c76415e09f7dea939064bd8 (diff)
downloaddtc-24cb3d0681d9196d57176a0a94bfc6e610ef7b45.zip
dtc-24cb3d0681d9196d57176a0a94bfc6e610ef7b45.tar.gz
dtc-24cb3d0681d9196d57176a0a94bfc6e610ef7b45.tar.bz2
dtc: fix some more -Wshadow warnings
Building on a RHEL6 system produced the following -Wshadow warnings in fstree.c, util.c and checks.c: cc1: warnings being treated as errors checks.c: In function 'parse_checks_option': checks.c:709: error: declaration of 'optarg' shadows a global declaration /usr/include/getopt.h:59: error: shadowed declaration is here make[1]: *** [checks.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make[1]: *** Waiting for unfinished jobs.... cc1: warnings being treated as errors fstree.c: In function 'read_fstree': fstree.c:40: error: declaration of 'tmpnam' shadows a global declaration /usr/include/stdio.h:208: error: shadowed declaration is here make[1]: *** [fstree.o] Error 1 cc1: warnings being treated as errors util.c: In function 'xstrdup': util.c:42: error: declaration of 'dup' shadows a global declaration /usr/include/unistd.h:528: error: shadowed declaration is here Fix all of these -Wshadow warnings by using slightly different variable names which won't collide with anything else. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'util.c')
-rw-r--r--util.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/util.c b/util.c
index 330b594..be67836 100644
--- a/util.c
+++ b/util.c
@@ -39,11 +39,11 @@
char *xstrdup(const char *s)
{
int len = strlen(s) + 1;
- char *dup = xmalloc(len);
+ char *d = xmalloc(len);
- memcpy(dup, s, len);
+ memcpy(d, s, len);
- return dup;
+ return d;
}
char *join_path(const char *path, const char *name)