emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

pmap: fix compiler warnings

Browse Source 
pmap.c:80:7: warning: declaration of 'mapbuf' shadows a global declaration [-Wshadow]
pmap.c:63:13: warning: shadowed declaration is here [-Wshadow]
pmap.c:137:37: warning: declaration of 'mapbuf' shadows a global declaration [-Wshadow]
pmap.c:63:13: warning: shadowed declaration is here [-Wshadow]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2012-11-02 17:50:56 +00:00 committed by Craig Small
parent 2c99a09e52
commit 22ceeca4a6
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pmap.c
View File

@ -77,7 +77,7 @@ static void discover_shm_minor(void)
{ {
void *addr; void *addr;
int shmid; int shmid;
char mapbuf[256]; char mapbuf_b[256];
if (!freopen("/proc/self/maps", "r", stdin)) if (!freopen("/proc/self/maps", "r", stdin))
return; return;
@ -92,20 +92,20 @@ static void discover_shm_minor(void)
if (addr == (void *)-1) if (addr == (void *)-1)
goto out_destroy; goto out_destroy;
while (fgets(mapbuf, sizeof mapbuf, stdin)) { while (fgets(mapbuf_b, sizeof mapbuf_b, stdin)) {
char flags[32]; char flags[32];
/* to clean up unprintables */ /* to clean up unprintables */
char *tmp; char *tmp;
unsigned KLONG start, end; unsigned KLONG start, end;
unsigned long long file_offset, inode; unsigned long long file_offset, inode;
unsigned dev_major, dev_minor; unsigned dev_major, dev_minor;
sscanf(mapbuf, "%" KLF "x-%" KLF "x %31s %llx %x:%x %llu", &start, sscanf(mapbuf_b, "%" KLF "x-%" KLF "x %31s %llx %x:%x %llu", &start,
&end, flags, &file_offset, &dev_major, &dev_minor, &end, flags, &file_offset, &dev_major, &dev_minor,
&inode); &inode);
tmp = strchr(mapbuf, '\n'); tmp = strchr(mapbuf_b, '\n');
if (tmp) if (tmp)
*tmp = '\0'; *tmp = '\0';
tmp = mapbuf; tmp = mapbuf_b;
while (*tmp) { while (*tmp) {
if (!isprint(*tmp)) if (!isprint(*tmp))
*tmp = '?'; *tmp = '?';
@ -117,7 +117,7 @@ static void discover_shm_minor(void)
continue; continue;
if (flags[3] != 's') if (flags[3] != 's')
continue; continue;
if (strstr(mapbuf, "/SYSV")) { if (strstr(mapbuf_b, "/SYSV")) {
shm_minor = dev_minor; shm_minor = dev_minor;
break; break;
} }
@ -134,26 +134,26 @@ static void discover_shm_minor(void)
} }
static char *mapping_name(proc_t * p, unsigned KLONG addr, static char *mapping_name(proc_t * p, unsigned KLONG addr,
unsigned KLONG len, const char *mapbuf, unsigned KLONG len, const char *mapbuf_b,
unsigned showpath, unsigned dev_major, unsigned showpath, unsigned dev_major,
unsigned dev_minor, unsigned long long inode) unsigned dev_minor, unsigned long long inode)
{ {
char *cp; char *cp;
if (!dev_major && dev_minor == shm_minor && strstr(mapbuf, "/SYSV")) { if (!dev_major && dev_minor == shm_minor && strstr(mapbuf_b, "/SYSV")) {
static char shmbuf[64]; static char shmbuf[64];
snprintf(shmbuf, sizeof shmbuf, " [ shmid=0x%llx ]", inode); snprintf(shmbuf, sizeof shmbuf, " [ shmid=0x%llx ]", inode);
return shmbuf; return shmbuf;
} }
cp = strrchr(mapbuf, '/'); cp = strrchr(mapbuf_b, '/');
if (cp) { if (cp) {
if (showpath) if (showpath)
return strchr(mapbuf, '/'); return strchr(mapbuf_b, '/');
return cp[1] ? cp + 1 : cp; return cp[1] ? cp + 1 : cp;
} }
cp = strchr(mapbuf, '/'); cp = strchr(mapbuf_b, '/');
if (cp) { if (cp) {
if (showpath) if (showpath)
return cp; return cp;