diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-03-15 04:24:15 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-03-15 04:24:15 +0000 |
commit | 5c2f92bbe57f50e9959e5ad140fa379c31e44209 (patch) | |
tree | 6b006841761ae5a84b72963512e855f389eadf9a /usr.bin | |
parent | e191e4ca3428574dfb2a2a7a24c8609fe8385da5 (diff) |
annoying whitespace die die die
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/top/commands.c | 8 | ||||
-rw-r--r-- | usr.bin/top/display.c | 4 | ||||
-rw-r--r-- | usr.bin/top/machine.c | 16 | ||||
-rw-r--r-- | usr.bin/top/screen.c | 12 | ||||
-rw-r--r-- | usr.bin/top/top.c | 10 | ||||
-rw-r--r-- | usr.bin/top/utils.c | 4 |
6 files changed, 27 insertions, 27 deletions
diff --git a/usr.bin/top/commands.c b/usr.bin/top/commands.c index 5a4f5d91d10..b63f2c3b193 100644 --- a/usr.bin/top/commands.c +++ b/usr.bin/top/commands.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commands.c,v 1.31 2013/11/28 18:24:55 deraadt Exp $ */ +/* $OpenBSD: commands.c,v 1.32 2017/03/15 04:24:14 deraadt Exp $ */ /* * Top users/processes display for Unix @@ -70,13 +70,13 @@ next_field(char *str) size_t span; span = strcspn(str, spaces); - if (span == strlen(str)) + if (span == strlen(str)) return (NULL); str += span; *str++ = '\0'; - while (strcspn(str, spaces) == 0) + while (strcspn(str, spaces) == 0) str++; if (*str == '\0') @@ -301,7 +301,7 @@ kill_procs(char *str) } else { /* translate the name into a number */ for (signum = 0; signum < NSIG; signum++) { - if (strcasecmp(sys_signame[signum], + if (strcasecmp(sys_signame[signum], str) == 0) break; } diff --git a/usr.bin/top/display.c b/usr.bin/top/display.c index bb8ca889b67..30b20b06489 100644 --- a/usr.bin/top/display.c +++ b/usr.bin/top/display.c @@ -1,4 +1,4 @@ -/* $OpenBSD: display.c,v 1.51 2016/08/27 04:07:42 guenther Exp $ */ +/* $OpenBSD: display.c,v 1.52 2017/03/15 04:24:14 deraadt Exp $ */ /* * Top users/processes display for Unix @@ -868,7 +868,7 @@ anykey(void) standendp(); if (smart_terminal) refresh(); - else + else fflush(stdout); while (1) { len = read(STDIN_FILENO, &ch, 1); diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index b65b8555a6a..02eac86dee5 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machine.c,v 1.87 2016/07/28 21:45:00 tedu Exp $ */ +/* $OpenBSD: machine.c,v 1.88 2017/03/15 04:24:14 deraadt Exp $ */ /*- * Copyright (c) 1994 Thorsten Lockert <tholo@sigmasoft.com> @@ -93,9 +93,9 @@ char *state_abbrev[] = { }; /* these are for calculating cpu state percentages */ -static int64_t **cp_time; -static int64_t **cp_old; -static int64_t **cp_diff; +static int64_t **cp_time; +static int64_t **cp_old; +static int64_t **cp_diff; /* these are for detailing the process states */ int process_states[8]; @@ -126,14 +126,14 @@ char *ordernames[] = { }; /* these are for keeping track of the proc array */ -static int nproc; -static int onproc = -1; -static int pref_len; +static int nproc; +static int onproc = -1; +static int pref_len; static struct kinfo_proc *pbase; static struct kinfo_proc **pref; /* these are for getting the memory statistics */ -static int pageshift; /* log base 2 of the pagesize */ +static int pageshift; /* log base 2 of the pagesize */ /* define pagetok in terms of pageshift */ #define pagetok(size) ((size) << pageshift) diff --git a/usr.bin/top/screen.c b/usr.bin/top/screen.c index b4d13760958..b65989ddbb0 100644 --- a/usr.bin/top/screen.c +++ b/usr.bin/top/screen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: screen.c,v 1.20 2010/02/05 10:21:10 otto Exp $ */ +/* $OpenBSD: screen.c,v 1.21 2017/03/15 04:24:14 deraadt Exp $ */ /* * Top users/processes display for Unix @@ -116,11 +116,11 @@ init_termcap(int interactive) else screen_width -= 1; - /* get necessary capabilities */ - if (tgetstr("cl", NULL) == NULL || tgetstr("cm", NULL) == NULL) { - smart_terminal = No; - return; - } + /* get necessary capabilities */ + if (tgetstr("cl", NULL) == NULL || tgetstr("cm", NULL) == NULL) { + smart_terminal = No; + return; + } /* get the actual screen size with an ioctl, if needed */ /* diff --git a/usr.bin/top/top.c b/usr.bin/top/top.c index 69721dda07c..f9317ab4ee5 100644 --- a/usr.bin/top/top.c +++ b/usr.bin/top/top.c @@ -1,4 +1,4 @@ -/* $OpenBSD: top.c,v 1.88 2015/11/05 17:17:13 espie Exp $ */ +/* $OpenBSD: top.c,v 1.89 2017/03/15 04:24:14 deraadt Exp $ */ /* * Top users/processes display for Unix @@ -711,7 +711,7 @@ rundisplay(void) new_message(MT_standout, "Processes should be a " "non-negative number"); - putr(); + putr(); no_command = Yes; } } else @@ -811,7 +811,7 @@ rundisplay(void) } } else if ((uid = userid(tempbuf)) == (uid_t)-1) { new_message(MT_standout, - " %s: unknown user", tempbuf); + " %s: unknown user", tempbuf); no_command = Yes; } else { ps.uid = uid; @@ -880,7 +880,7 @@ rundisplay(void) case CMD_command: show_args = (show_args == No) ? Yes : No; break; - + case CMD_threads: ps.threads = !ps.threads; old_threads = ps.threads; @@ -934,7 +934,7 @@ rundisplay(void) case CMD_add: ps.uid = (uid_t)-1; /* uid */ ps.huid = (uid_t)-1; - ps.pid = (pid_t)-1; /* pid */ + ps.pid = (pid_t)-1; /* pid */ ps.system = old_system; ps.command = NULL; /* grep */ hlpid = -1; diff --git a/usr.bin/top/utils.c b/usr.bin/top/utils.c index 7e33cdead4a..cb21df164b5 100644 --- a/usr.bin/top/utils.c +++ b/usr.bin/top/utils.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utils.c,v 1.25 2015/01/16 06:40:13 deraadt Exp $ */ +/* $OpenBSD: utils.c,v 1.26 2017/03/15 04:24:14 deraadt Exp $ */ /* * Top users/processes display for Unix @@ -58,7 +58,7 @@ atoiwi(char *str) strncmp(str, "all", len) == 0 || strncmp(str, "maximum", len) == 0) { return (Infinity); - } + } i = (int)strtonum(str, 0, INT_MAX, &errstr); if (errstr) { return (Invalid); |