diff options
| author | Jim Warner <james.warner@comcast.net> | 2011-12-09 11:10:30 -0600 |
|---|---|---|
| committer | Craig Small <csmall@enc.com.au> | 2011-12-22 23:48:06 +1100 |
| commit | 2246663f66a68e59d08de1a1307a7f3e9a0649b7 (patch) | |
| tree | f594104d416e276bcb1fac73b4b0959a3bfdaebf | |
| parent | db88a8d2420664ab108d6aa5400f2cea6ac660d5 (diff) | |
| download | procps-ng-2246663f66a68e59d08de1a1307a7f3e9a0649b7.tar.gz | |
top: changed 'err' to 'errmsg', avoid conflict with <err.h>
| -rw-r--r-- | top/top.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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': |