From owner-svn-src-head@freebsd.org Sat Jun 2 07:44:52 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 332DFFD32A4; Sat, 2 Jun 2018 07:44:52 +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 CDB4D72AD1; Sat, 2 Jun 2018 07:44:51 +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 AB5854EBF; Sat, 2 Jun 2018 07:44:51 +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 w527ipFs079749; Sat, 2 Jun 2018 07:44:51 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w527ipN4079746; Sat, 2 Jun 2018 07:44:51 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201806020744.w527ipN4079746@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sat, 2 Jun 2018 07:44:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334524 - 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: 334524 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: Sat, 02 Jun 2018 07:44:52 -0000 Author: eadler Date: Sat Jun 2 07:44:50 2018 New Revision: 334524 URL: https://svnweb.freebsd.org/changeset/base/334524 Log: top(1): const poison part 2 Further reduce the number of warnings emitted by gcc. Modified: head/usr.bin/top/display.c head/usr.bin/top/display.h head/usr.bin/top/machine.c Modified: head/usr.bin/top/display.c ============================================================================== --- head/usr.bin/top/display.c Sat Jun 2 06:40:15 2018 (r334523) +++ head/usr.bin/top/display.c Sat Jun 2 07:44:50 2018 (r334524) @@ -945,7 +945,7 @@ display_header(int t) } void -new_message(int type, char *msgfmt, ...) +new_message(int type, const char *msgfmt, ...) { va_list args; size_t i; Modified: head/usr.bin/top/display.h ============================================================================== --- head/usr.bin/top/display.h Sat Jun 2 06:40:15 2018 (r334523) +++ head/usr.bin/top/display.h Sat Jun 2 07:44:50 2018 (r334524) @@ -1,8 +1,6 @@ /* $FreeBSD$ */ /* constants needed for display.c */ -/* "type" argument for new_message function */ - #define MT_standout 1 #define MT_delayed 2 @@ -26,7 +24,7 @@ void i_procstates(int total, int *brkdn); void i_swap(int *stats); void i_timeofday(time_t *tod); void i_uptime(struct timeval *bt, time_t *tod); -void new_message(int type, char *msgfmt, ...); +void new_message(int type, const char *msgfmt, ...); int readline(char *buffer, int size, int numeric); char *trim_header(char *text); void u_arc(int *stats); Modified: head/usr.bin/top/machine.c ============================================================================== --- head/usr.bin/top/machine.c Sat Jun 2 06:40:15 2018 (r334523) +++ head/usr.bin/top/machine.c Sat Jun 2 07:44:50 2018 (r334524) @@ -119,7 +119,7 @@ static char up_header_tid_only[] = /* the extra nulls in the string "run" are for adding a slash and the processor number when needed */ -static char *state_abbrev[] = { +static const char *state_abbrev[] = { "", "START", "RUN\0\0\0", "SLEEP", "STOP", "ZOMB", "WAIT", "LOCK" }; @@ -1354,8 +1354,8 @@ static int sorted_state[] = { static int compare_cpu(const void *arg1, const void *arg2) { - struct kinfo_proc *p1 = *(struct kinfo_proc **)arg1; - struct kinfo_proc *p2 = *(struct kinfo_proc **)arg2; + const struct kinfo_proc *p1 = *(const struct kinfo_proc * const *)arg1; + const struct kinfo_proc *p2 = *(const struct kinfo_proc * const *)arg2; ORDERKEY_PCTCPU(p1, p2); ORDERKEY_CPTICKS(p1, p2); @@ -1408,8 +1408,8 @@ int (*compares[])(const void *arg1, const void *arg2) int compare_size(const void *arg1, const void *arg2) { - struct kinfo_proc *p1 = *(struct kinfo_proc **)arg1; - struct kinfo_proc *p2 = *(struct kinfo_proc **)arg2; + const struct kinfo_proc *p1 = *(const struct kinfo_proc * const *)arg1; + const struct kinfo_proc *p2 = *(const struct kinfo_proc * const *)arg2; ORDERKEY_MEM(p1, p2); ORDERKEY_RSSIZE(p1, p2); @@ -1426,8 +1426,8 @@ compare_size(const void *arg1, const void *arg2) int compare_res(const void *arg1, const void *arg2) { - struct kinfo_proc *p1 = *(struct kinfo_proc **)arg1; - struct kinfo_proc *p2 = *(struct kinfo_proc **)arg2; + const struct kinfo_proc *p1 = *(const struct kinfo_proc * const *)arg1; + const struct kinfo_proc *p2 = *(const struct kinfo_proc * const *)arg2; ORDERKEY_RSSIZE(p1, p2); ORDERKEY_MEM(p1, p2); @@ -1444,8 +1444,8 @@ compare_res(const void *arg1, const void *arg2) int compare_time(const void *arg1, const void *arg2) { - struct kinfo_proc *p1 = *(struct kinfo_proc **)arg1; - struct kinfo_proc *p2 = *(struct kinfo_proc **)arg2; + const struct kinfo_proc *p1 = *(const struct kinfo_proc * const *)arg1; + const struct kinfo_proc *p2 = *(const struct kinfo_proc * const *) arg2; ORDERKEY_CPTICKS(p1, p2); ORDERKEY_PCTCPU(p1, p2); @@ -1462,8 +1462,8 @@ compare_time(const void *arg1, const void *arg2) int compare_prio(const void *arg1, const void *arg2) { - struct kinfo_proc *p1 = *(struct kinfo_proc **)arg1; - struct kinfo_proc *p2 = *(struct kinfo_proc **)arg2; + const struct kinfo_proc *p1 = *(const struct kinfo_proc * const *)arg1; + const struct kinfo_proc *p2 = *(const struct kinfo_proc * const *)arg2; ORDERKEY_PRIO(p1, p2); ORDERKEY_CPTICKS(p1, p2); @@ -1479,8 +1479,8 @@ compare_prio(const void *arg1, const void *arg2) static int compare_threads(const void *arg1, const void *arg2) { - struct kinfo_proc *p1 = *(struct kinfo_proc **)arg1; - struct kinfo_proc *p2 = *(struct kinfo_proc **)arg2; + const struct kinfo_proc *p1 = *(const struct kinfo_proc * const *)arg1; + const struct kinfo_proc *p2 = *(const struct kinfo_proc * const *)arg2; ORDERKEY_THREADS(p1, p2); ORDERKEY_PCTCPU(p1, p2); @@ -1497,8 +1497,8 @@ compare_threads(const void *arg1, const void *arg2) static int compare_jid(const void *arg1, const void *arg2) { - struct kinfo_proc *p1 = *(struct kinfo_proc **)arg1; - struct kinfo_proc *p2 = *(struct kinfo_proc **)arg2; + const struct kinfo_proc *p1 = *(const struct kinfo_proc * const *)arg1; + const struct kinfo_proc *p2 = *(const struct kinfo_proc * const *)arg2; ORDERKEY_JID(p1, p2); ORDERKEY_PCTCPU(p1, p2); @@ -1515,8 +1515,8 @@ compare_jid(const void *arg1, const void *arg2) static int compare_swap(const void *arg1, const void *arg2) { - struct kinfo_proc *p1 = *(struct kinfo_proc **)arg1; - struct kinfo_proc *p2 = *(struct kinfo_proc **)arg2; + const struct kinfo_proc *p1 = *(const struct kinfo_proc **)arg1; + const struct kinfo_proc *p2 = *(const struct kinfo_proc **)arg2; ORDERKEY_SWAP(p1, p2); ORDERKEY_PCTCPU(p1, p2); @@ -1534,8 +1534,8 @@ compare_swap(const void *arg1, const void *arg2) int compare_iototal(const void *arg1, const void *arg2) { - struct kinfo_proc *p1 = *(struct kinfo_proc **)arg1; - struct kinfo_proc *p2 = *(struct kinfo_proc **)arg2; + struct kinfo_proc * const p1 = *(struct kinfo_proc **)arg1; + struct kinfo_proc * const p2 = *(struct kinfo_proc **)arg2; return (get_io_total(p2) - get_io_total(p1)); }