From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 04/10] kill: move magic numbers in beginning of the file
Date: Sun, 9 Mar 2014 15:30:17 -0500 [thread overview]
Message-ID: <1394397023-7050-4-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1394397023-7050-1-git-send-email-kerolasa@iki.fi>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
misc-utils/kill.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/misc-utils/kill.c b/misc-utils/kill.c
index 877c24e..b95e03d 100644
--- a/misc-utils/kill.c
+++ b/misc-utils/kill.c
@@ -57,6 +57,11 @@
#include "ttyutils.h"
#include "xalloc.h"
+enum {
+ KILL_FIELD_WIDTH = 11,
+ KILL_OUTPUT_WIDTH = 72
+};
+
struct signv {
const char *name;
int val;
@@ -388,15 +393,14 @@ static void printsig(int sig)
printf("%d\n", sig);
}
-#define FIELD_WIDTH 11
static void pretty_print_signal(FILE *fp, size_t term_width, size_t *lpos,
int signum, const char *name)
{
- if (term_width < (*lpos + FIELD_WIDTH)) {
+ if (term_width < (*lpos + KILL_FIELD_WIDTH)) {
fputc('\n', fp);
*lpos = 0;
}
- *lpos += FIELD_WIDTH;
+ *lpos += KILL_FIELD_WIDTH;
fprintf(fp, "%2d %-8s", signum, name);
}
@@ -407,7 +411,7 @@ static void printsignals(FILE *fp, int pretty)
if (!pretty) {
for (n = 0; n < ARRAY_SIZE(sys_signame); n++) {
lth = 1 + strlen(sys_signame[n].name);
- if (72 < lpos + lth) {
+ if (KILL_OUTPUT_WIDTH < lpos + lth) {
fputc('\n', fp);
lpos = 0;
} else if (lpos)
@@ -424,7 +428,7 @@ static void printsignals(FILE *fp, int pretty)
/* pretty print */
width = get_terminal_width();
if (width == 0)
- width = 72;
+ width = KILL_OUTPUT_WIDTH;
else
width -= 1;
for (n = 0; n < ARRAY_SIZE(sys_signame); n++)
--
1.9.0
next prev parent reply other threads:[~2014-03-09 20:30 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-09 20:30 [PATCH 01/10] findfs: use symbolic exit values, and tell about them in manual Sami Kerola
2014-03-09 20:30 ` [PATCH 02/10] kill: fix coding style Sami Kerola
2014-04-07 9:36 ` Karel Zak
2014-04-07 14:09 ` Sami Kerola
2014-03-09 20:30 ` [PATCH 03/10] kill: flip all comparions to be in smaller - greater order Sami Kerola
2014-03-19 12:32 ` Benno Schulenberg
2014-03-19 19:35 ` Sami Kerola
2014-03-19 20:30 ` Benno Schulenberg
2014-03-09 20:30 ` Sami Kerola [this message]
2014-03-09 20:30 ` [PATCH 05/10] kill: make usage() not to return Sami Kerola
2014-03-19 12:37 ` Benno Schulenberg
2014-03-19 19:02 ` Sami Kerola
2014-03-09 20:30 ` [PATCH 06/10] kill: leeway deprecation of --pid invocation as command name Sami Kerola
2014-03-11 7:21 ` Bernhard Voelker
2014-03-11 12:13 ` Sami Kerola
2014-04-07 8:30 ` Karel Zak
2014-03-09 20:30 ` [PATCH 07/10] kill: use control structure to pass user input to functions Sami Kerola
2014-04-07 9:28 ` Karel Zak
2014-03-09 20:30 ` [PATCH 08/10] kill: tell what is wrong rather than output usage() Sami Kerola
2014-03-09 20:30 ` [PATCH 09/10] kill: add parse_arguments() function Sami Kerola
2014-03-09 20:30 ` [PATCH 10/10] kill: move sigqueue inputs to control struct Sami Kerola
2014-03-12 10:37 ` [PATCH 01/10] findfs: use symbolic exit values, and tell about them in manual Karel Zak
2014-03-13 16:49 ` Sami Kerola
2014-03-26 11:19 ` Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394397023-7050-4-git-send-email-kerolasa@iki.fi \
--to=kerolasa@iki.fi \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox