From cbb9e54587ece0fce252257dacd47dcfc9b892cd Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sun, 5 Feb 2012 21:43:36 +0100 Subject: [PATCH] pmap: ensure arg1 is not null, and set qualifers to match with usage [smatch scan] pmap.c:436 main(59) error: we previously assumed 'arg1' could be null (see line 427) pmap.c:136:3: warning: return discards 'const' qualifier from pointer target type [enabled by default] pmap.c:142:4: warning: return discards 'const' qualifier from pointer target type [enabled by default] pmap.c:150:2: warning: return discards 'const' qualifier from pointer target type [enabled by default] pmap.c:300:8: warning: assignment discards 'const' qualifier from pointer target type [enabled by default] Signed-off-by: Sami Kerola --- pmap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pmap.c b/pmap.c index 3296ea70..e0801eff 100644 --- a/pmap.c +++ b/pmap.c @@ -116,12 +116,12 @@ static void discover_shm_minor(void) return; } -static const 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 showpath, unsigned dev_major, unsigned dev_minor, unsigned long long inode) { - const char *cp; + char *cp; if (!dev_major && dev_minor == shm_minor && strstr(mapbuf, "/SYSV")) { static char shmbuf[64]; @@ -433,11 +433,11 @@ int main(int argc, char **argv) if(arg2) ++arg2; else arg2 = arg1; - if (*arg1) + if (arg1 && *arg1) range_low = STRTOUKL(arg1, &arg1, 16); if (*arg2) range_high = STRTOUKL(arg2, &arg2, 16); - if (*arg1 || *arg2) + if (arg1 && (*arg1 || *arg2)) usage(stderr); } break;