diff options
author | Roland McGrath <roland@hack.frob.com> | 2014-10-13 11:12:28 -0700 |
---|---|---|
committer | Roland McGrath <roland@hack.frob.com> | 2014-10-13 11:12:28 -0700 |
commit | 53544380266a8eb38bef9389562fba3ed58a0d11 (patch) | |
tree | d040f7c483990e8cf4bb8e11102f15c04a2f6514 /elf/dl-version.c | |
parent | fcb32af153a745414b0d949e707c9485ab77d6ba (diff) | |
download | glibc-roland/Wshadow.tar glibc-roland/Wshadow.tar.gz glibc-roland/Wshadow.tar.bz2 glibc-roland/Wshadow.zip |
Diffstat (limited to 'elf/dl-version.c')
-rw-r--r-- | elf/dl-version.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/elf/dl-version.c b/elf/dl-version.c index 525e9d52e5..735746c6a2 100644 --- a/elf/dl-version.c +++ b/elf/dl-version.c @@ -30,19 +30,19 @@ #define make_string(string, rest...) \ ({ \ - const char *all[] = { string, ## rest }; \ - size_t len, cnt; \ - char *result, *cp; \ + const char *_all[] = { string, ## rest }; \ + size_t _len, _cnt; \ + char *_result, *_cp; \ \ - len = 1; \ - for (cnt = 0; cnt < sizeof (all) / sizeof (all[0]); ++cnt) \ - len += strlen (all[cnt]); \ + _len = 1; \ + for (_cnt = 0; _cnt < sizeof (_all) / sizeof (_all[0]); ++_cnt) \ + _len += strlen (_all[_cnt]); \ \ - cp = result = alloca (len); \ - for (cnt = 0; cnt < sizeof (all) / sizeof (all[0]); ++cnt) \ - cp = __stpcpy (cp, all[cnt]); \ + _cp = _result = alloca (_len); \ + for (_cnt = 0; _cnt < sizeof (_all) / sizeof (_all[0]); ++_cnt) \ + _cp = __stpcpy (_cp, _all[_cnt]); \ \ - result; \ + _result; \ }) |