d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

top(1): clean up in prep for const poisoning

Browse Source 
- sprinkle "const" in a few obvious places
- remove "(void)" in front of lack-of-error-checked functions
This commit is contained in:
Eitan Adler 2018-05-21 04:32:14 +00:00
parent 47ffa267d7
commit 419fab3b14
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
usr.bin/top/commands.c
View File

@ -43,7 +43,7 @@ struct errs /* structure for a system-call error */
char *arg; /* argument that caused the error */ char *arg; /* argument that caused the error */
}; };
char *err_string(void); static char *err_string(void);
static int str_adderr(char *str, int len, int err); static int str_adderr(char *str, int len, int err);
static int str_addarg(char *str, int len, char *arg, int first); static int str_addarg(char *str, int len, char *arg, int first);
@ -237,7 +237,7 @@ char *err_string()
{ {
return(err_listem); return(err_listem);
} }
(void) strcat(string, "; "); /* we know there's more */ strcat(string, "; "); /* we know there's more */
} }
currerr = errp->errnum; currerr = errp->errnum;
first = Yes; first = Yes;
@ -262,15 +262,10 @@ char *err_string()
*/ */
static int static int
str_adderr(str, len, err) str_adderr(char *str, int len, int err)
char *str;
int len;
int err;
{ {
char *msg; const char *msg;
int msglen; int msglen;
msg = err == 0 ? "Not a number" : strerror(err); msg = err == 0 ? "Not a number" : strerror(err);
msglen = strlen(msg) + 2; msglen = strlen(msg) + 2;
@ -278,8 +273,8 @@ int err;
{ {
return(0); return(0);
} }
(void) strcat(str, ": "); strcat(str, ": ");
(void) strcat(str, msg); strcat(str, msg);
return(len - msglen); return(len - msglen);
} }
@ -311,9 +306,9 @@ int first;
} }
if (!first) if (!first)
{ {
(void) strcat(str, ", "); strcat(str, ", ");
} }
(void) strcat(str, arg); strcat(str, arg);
return(len - arglen); return(len - arglen);
} }
@ -402,7 +397,7 @@ kill_procs(char *str)
if (isdigit(str[1])) if (isdigit(str[1]))
{ {
(void) scanint(str + 1, &signum); scanint(str + 1, &signum);
if (signum <= 0 || signum >= NSIG) if (signum <= 0 || signum >= NSIG)
{ {
return(" invalid signal number"); return(" invalid signal number");