diff options
| author |   guenther <guenther@openbsd.org> | 2014-07-14 05:53:29 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2014-07-14 05:53:29 +0000 |
| commit | 93079f381cdf5d6f4815571cf539f8b75fc5347f (patch) | |
| tree | 8df0fb9a04d9d4e738309b400b420ff2221ba8ca | |
| parent | Add sendsyslog too, and sort (diff) | |
| download | wireguard-openbsd-93079f381cdf5d6f4815571cf539f8b75fc5347f.tar.xz wireguard-openbsd-93079f381cdf5d6f4815571cf539f8b75fc5347f.zip | |
Instead of using a variable format string to change the field width,
use %*s and just put the width in a variable
| -rw-r--r-- | bin/csh/proc.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/bin/csh/proc.c b/bin/csh/proc.c index 0067cc80a1a..c8d918ef453 100644 --- a/bin/csh/proc.c +++ b/bin/csh/proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.c,v 1.22 2011/11/06 01:43:50 guenther Exp $ */ +/* $OpenBSD: proc.c,v 1.23 2014/07/14 05:53:29 guenther Exp $ */ /* $NetBSD: proc.c,v 1.9 1995/04/29 23:21:33 mycroft Exp $ */ /*- @@ -689,13 +689,12 @@ pprint(struct process *pp, bool flag) hadnl = 0; } if (flag & (REASON | AREASON)) { + int width = 0; if (flag & NAME) - format = "%-23s"; - else - format = "%s"; + width = -23; if (pstatus == status) if (pp->p_reason == reason) { - (void) fprintf(cshout, format, ""); + (void) fprintf(cshout, "%*s", width, ""); hadnl = 0; goto prcomd; } @@ -708,7 +707,7 @@ pprint(struct process *pp, bool flag) switch (status) { case PRUNNING: - (void) fprintf(cshout, format, "Running "); + (void) fprintf(cshout, "%*s", width, "Running "); hadnl = 0; break; @@ -725,7 +724,7 @@ pprint(struct process *pp, bool flag) && reason != SIGINT && (reason != SIGPIPE || (pp->p_flags & PPOU) == 0))) { - (void) fprintf(cshout, format, + (void) fprintf(cshout, "%*s", width, sys_siglist[(unsigned char) pp->p_reason]); hadnl = 0; @@ -738,7 +737,7 @@ pprint(struct process *pp, bool flag) if (pp->p_reason) (void) fprintf(cshout, "Exit %-18d", pp->p_reason); else - (void) fprintf(cshout, format, "Done"); + (void) fprintf(cshout, "%*s", width, "Done"); hadnl = 0; } break; |