diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-21 11:09:40 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-21 11:09:40 +0000 |
| commit | 5e34ff29bcc870936ab18172f438a34d042d4e03 (patch) | |
| tree | a5e7a528f2f916eb883f1161eadceacdf2dca4be /coreutils/tty.c | |
| parent | 8b814b4a349e2262c0ad25793b05206a14651ebb (diff) | |
| download | busybox-5e34ff29bcc870936ab18172f438a34d042d4e03.tar.gz | |
*: mass renaming of USE_XXXX to IF_XXXX
and SKIP_XXXX to IF_NOT_XXXX - the second one was especially
badly named. It was not skipping anything!
Diffstat (limited to 'coreutils/tty.c')
| -rw-r--r-- | coreutils/tty.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/coreutils/tty.c b/coreutils/tty.c index d49fb50b6..74a4ea3d6 100644 --- a/coreutils/tty.c +++ b/coreutils/tty.c @@ -13,17 +13,17 @@ #include "libbb.h" int tty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int tty_main(int argc, char **argv SKIP_INCLUDE_SUSv2(UNUSED_PARAM)) +int tty_main(int argc, char **argv IF_NOT_INCLUDE_SUSv2(UNUSED_PARAM)) { const char *s; - USE_INCLUDE_SUSv2(int silent;) /* Note: No longer relevant in SUSv3. */ + IF_INCLUDE_SUSv2(int silent;) /* Note: No longer relevant in SUSv3. */ int retval; xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */ - USE_INCLUDE_SUSv2(silent = getopt32(argv, "s");) - USE_INCLUDE_SUSv2(argc -= optind;) - SKIP_INCLUDE_SUSv2(argc -= 1;) + IF_INCLUDE_SUSv2(silent = getopt32(argv, "s");) + IF_INCLUDE_SUSv2(argc -= optind;) + IF_NOT_INCLUDE_SUSv2(argc -= 1;) /* gnu tty outputs a warning that it is ignoring all args. */ bb_warn_ignoring_args(argc); @@ -37,8 +37,8 @@ int tty_main(int argc, char **argv SKIP_INCLUDE_SUSv2(UNUSED_PARAM)) s = "not a tty"; retval = 1; } - USE_INCLUDE_SUSv2(if (!silent) puts(s);) - SKIP_INCLUDE_SUSv2(puts(s);) + IF_INCLUDE_SUSv2(if (!silent) puts(s);) + IF_NOT_INCLUDE_SUSv2(puts(s);) fflush_stdout_and_exit(retval); } |