From owner-svn-src-head@freebsd.org Mon May 21 04:32:15 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C85C2EE230F; Mon, 21 May 2018 04:32:15 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7A6916BCCE; Mon, 21 May 2018 04:32:15 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5B7B8202CC; Mon, 21 May 2018 04:32:15 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4L4WF93098967; Mon, 21 May 2018 04:32:15 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4L4WFsW098966; Mon, 21 May 2018 04:32:15 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201805210432.w4L4WFsW098966@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Mon, 21 May 2018 04:32:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333961 - head/usr.bin/top X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/usr.bin/top X-SVN-Commit-Revision: 333961 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 May 2018 04:32:16 -0000 Author: eadler Date: Mon May 21 04:32:14 2018 New Revision: 333961 URL: https://svnweb.freebsd.org/changeset/base/333961 Log: top(1): clean up in prep for const poisoning - sprinkle "const" in a few obvious places - remove "(void)" in front of lack-of-error-checked functions Modified: head/usr.bin/top/commands.c Modified: head/usr.bin/top/commands.c ============================================================================== --- head/usr.bin/top/commands.c Mon May 21 04:02:45 2018 (r333960) +++ head/usr.bin/top/commands.c Mon May 21 04:32:14 2018 (r333961) @@ -43,7 +43,7 @@ struct errs /* structure for a system-call 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_addarg(char *str, int len, char *arg, int first); @@ -237,7 +237,7 @@ char *err_string() { return(err_listem); } - (void) strcat(string, "; "); /* we know there's more */ + strcat(string, "; "); /* we know there's more */ } currerr = errp->errnum; first = Yes; @@ -262,15 +262,10 @@ char *err_string() */ static int -str_adderr(str, len, err) - -char *str; -int len; -int err; - +str_adderr(char *str, int len, int err) { - char *msg; - int msglen; + const char *msg; + int msglen; msg = err == 0 ? "Not a number" : strerror(err); msglen = strlen(msg) + 2; @@ -278,8 +273,8 @@ int err; { return(0); } - (void) strcat(str, ": "); - (void) strcat(str, msg); + strcat(str, ": "); + strcat(str, msg); return(len - msglen); } @@ -311,9 +306,9 @@ int first; } if (!first) { - (void) strcat(str, ", "); + strcat(str, ", "); } - (void) strcat(str, arg); + strcat(str, arg); return(len - arglen); } @@ -402,7 +397,7 @@ kill_procs(char *str) if (isdigit(str[1])) { - (void) scanint(str + 1, &signum); + scanint(str + 1, &signum); if (signum <= 0 || signum >= NSIG) { return(" invalid signal number");