From owner-svn-src-head@freebsd.org Wed Jun 13 08:52:33 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 AEF5D10151EC; Wed, 13 Jun 2018 08:52:33 +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 8680E754F8; Wed, 13 Jun 2018 08:52:23 +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 275AA172E4; Wed, 13 Jun 2018 08:52:23 +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 w5D8qNKT094630; Wed, 13 Jun 2018 08:52:23 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5D8qMin094627; Wed, 13 Jun 2018 08:52:22 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201806130852.w5D8qMin094627@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Wed, 13 Jun 2018 08:52:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r335043 - 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: 335043 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: Wed, 13 Jun 2018 08:52:34 -0000 Author: eadler Date: Wed Jun 13 08:52:22 2018 New Revision: 335043 URL: https://svnweb.freebsd.org/changeset/base/335043 Log: top(1): style(9) - split return type from function name - Sprinkle a __pure where possible. Modified: head/usr.bin/top/display.c head/usr.bin/top/username.c head/usr.bin/top/utils.c Modified: head/usr.bin/top/display.c ============================================================================== --- head/usr.bin/top/display.c Wed Jun 13 08:52:19 2018 (r335042) +++ head/usr.bin/top/display.c Wed Jun 13 08:52:22 2018 (r335043) @@ -160,7 +160,8 @@ display_resize(void) return(smart_terminal ? lines : Largest); } -int display_updatecpus(struct statics *statics) +int +display_updatecpus(struct statics *statics) { int lines; int i; @@ -184,7 +185,8 @@ int display_updatecpus(struct statics *statics) return(lines); } -int display_init(struct statics * statics) +int +display_init(struct statics * statics) { int lines; char **pp; @@ -1074,7 +1076,8 @@ readline(char *buffer, int size, int numeric) /* internal support routines */ -static void summary_format(char *str, int *numbers, const char * const *names) +static void +summary_format(char *str, int *numbers, const char * const *names) { char *p; int num; Modified: head/usr.bin/top/username.c ============================================================================== --- head/usr.bin/top/username.c Wed Jun 13 08:52:19 2018 (r335042) +++ head/usr.bin/top/username.c Wed Jun 13 08:52:22 2018 (r335043) @@ -55,7 +55,8 @@ struct hash_el { static struct hash_el hash_table[Table_size]; -char *username(int uid) +char * +username(int uid) { int hashindex; @@ -68,7 +69,8 @@ char *username(int uid) return(hash_table[hashindex].name); } -int userid(char username[]) +int +userid(char username[]) { struct passwd *pwd; @@ -89,7 +91,8 @@ int userid(char username[]) } /* wecare 1 = enter it always, 0 = nice to have */ -int enter_user(int uid, char name[], bool wecare) +int +enter_user(int uid, char name[], bool wecare) { int hashindex; Modified: head/usr.bin/top/utils.c ============================================================================== --- head/usr.bin/top/utils.c Wed Jun 13 08:52:19 2018 (r335042) +++ head/usr.bin/top/utils.c Wed Jun 13 08:52:22 2018 (r335043) @@ -122,7 +122,7 @@ digits(int val) * string_index(string, array) - find string in array and return index */ -int +int __pure string_index(const char *string, const char * const *array) { size_t i = 0; @@ -175,7 +175,7 @@ argparse(char *line, int *cntp) * useful on for calculating cpu state percentages. */ -long +long __pure percentages(int cnt, int *out, long *new, long *old, long *diffs) { int i;