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

top: changed 'err' to 'errmsg', avoid conflict with <err.h>

Browse Source
This commit is contained in:
Jim Warner 2011-12-09 11:10:30 -06:00 committed by Craig Small
parent db88a8d242
commit 2246663f66
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
top/top.c
View File

@ -2324,12 +2324,12 @@ static void parse_args (char **args) {
break;
case 'u':
case 'U':
{ const char *err;
{ const char *errmsg;
if (Monpidsidx || Curwin->usrseltyp) error_exit(N_txt(SELECT_clash_txt));
if (cp[1]) cp++;
else if (*args) cp = *args++;
else error_exit(fmtmk(N_fmt(MISSING_args_fmt), ch));
if ((err = user_certify(Curwin, cp, ch))) error_exit(err);
if ((errmsg = user_certify(Curwin, cp, ch))) error_exit(errmsg);
cp += strlen(cp);
break;
}
@ -2958,9 +2958,9 @@ static void keys_task (int ch) {
case 'U':
case 'u':
if (VIZCHKw(w)) {
const char *err;
if ((err = user_certify(w, linein(N_txt(GET_user_ids_txt)), ch)))
show_msg(err);
const char *errmsg;
if ((errmsg = user_certify(w, linein(N_txt(GET_user_ids_txt)), ch)))
show_msg(errmsg);
}
break;
case 'V':