From owner-svn-src-head@freebsd.org Tue Jul 10 17:20:28 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 691EB103DF2F; Tue, 10 Jul 2018 17:20:28 +0000 (UTC) (envelope-from markj@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 1A789813D7; Tue, 10 Jul 2018 17:20:28 +0000 (UTC) (envelope-from markj@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 EFB7B26D51; Tue, 10 Jul 2018 17:20:27 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6AHKR7A089601; Tue, 10 Jul 2018 17:20:27 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6AHKRiV089600; Tue, 10 Jul 2018 17:20:27 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201807101720.w6AHKRiV089600@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 10 Jul 2018 17:20:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336174 - head/usr.bin/top X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/usr.bin/top X-SVN-Commit-Revision: 336174 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.27 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: Tue, 10 Jul 2018 17:20:28 -0000 Author: markj Date: Tue Jul 10 17:20:27 2018 New Revision: 336174 URL: https://svnweb.freebsd.org/changeset/base/336174 Log: Fix thread state summary line display after r334918. Modified: head/usr.bin/top/display.c Modified: head/usr.bin/top/display.c ============================================================================== --- head/usr.bin/top/display.c Tue Jul 10 17:01:19 2018 (r336173) +++ head/usr.bin/top/display.c Tue Jul 10 17:20:27 2018 (r336174) @@ -347,12 +347,12 @@ i_procstates(int total, int *brkdn) procstates_buffer = setup_buffer(procstates_buffer, 0); /* write current number of processes and remember the value */ - printf("%d %s:", total, (ps.thread) ? "threads" :"processes"); + printf("%d %s:", total, ps.thread ? "threads" : "processes"); ltotal = total; /* put out enough spaces to get to column 15 */ i = digits(total); - while (i++ < 4) + while (i++ < (ps.thread ? 6 : 4)) { putchar(' '); } @@ -389,10 +389,10 @@ else { /* if number of digits differs, rewrite the label */ if (digits(total) != digits(ltotal)) { - fputs(" processes:", stdout); + printf(" %s:", ps.thread ? "threads" : "processes"); /* put out enough spaces to get to column 15 */ i = digits(total); - while (i++ < 4) + while (i++ < (ps.thread ? 6 : 4)) { putchar(' '); }