From 2ec91aead52d6ea6a42420005119ebb281a76cdc Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 4 Jan 2010 14:15:38 +0100 Subject: *: remove some uses of argc function old new delta whoami_main 34 37 +3 logname_main 60 63 +3 hostid_main 35 38 +3 ttysize_main 136 135 -1 nmeter_main 673 672 -1 logger_main 387 386 -1 uuencode_main 330 328 -2 ifupdown_main 2125 2123 -2 mesg_main 158 155 -3 free_main 333 330 -3 cal_main 902 899 -3 acpid_main 443 440 -3 ar_main 196 189 -7 find_main 476 467 -9 ifconfig_main 1235 1221 -14 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/12 up/down: 9/-49) Total: -40 bytes Signed-off-by: Denys Vlasenko --- init/mesg.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'init') diff --git a/init/mesg.c b/init/mesg.c index ca230f363..2e8b16e5d 100644 --- a/init/mesg.c +++ b/init/mesg.c @@ -16,21 +16,23 @@ #endif int mesg_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int mesg_main(int argc, char **argv) +int mesg_main(int argc UNUSED_PARAM, char **argv) { struct stat sb; const char *tty; char c = 0; - if (--argc == 0 - || (argc == 1 && ((c = **++argv) == 'y' || c == 'n')) + argv++; + + if (!argv[0] + || (!argv[1] && ((c = argv[0][0]) == 'y' || c == 'n')) ) { tty = xmalloc_ttyname(STDERR_FILENO); if (tty == NULL) { tty = "ttyname"; } else if (stat(tty, &sb) == 0) { mode_t m; - if (argc == 0) { + if (c == 0) { puts((sb.st_mode & (S_IWGRP|S_IWOTH)) ? "is y" : "is n"); return EXIT_SUCCESS; } -- cgit v1.2.3-55-g6feb