aboutsummaryrefslogtreecommitdiff
path: root/coreutils/expand.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2009-04-21 11:09:40 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2009-04-21 11:09:40 +0000
commit5e34ff29bcc870936ab18172f438a34d042d4e03 (patch)
treea5e7a528f2f916eb883f1161eadceacdf2dca4be /coreutils/expand.c
parent8b814b4a349e2262c0ad25793b05206a14651ebb (diff)
downloadbusybox-w32-5e34ff29bcc870936ab18172f438a34d042d4e03.tar.gz
busybox-w32-5e34ff29bcc870936ab18172f438a34d042d4e03.tar.bz2
busybox-w32-5e34ff29bcc870936ab18172f438a34d042d4e03.zip
*: 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/expand.c')
-rw-r--r--coreutils/expand.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/coreutils/expand.c b/coreutils/expand.c
index 0967e2534..7137c3b89 100644
--- a/coreutils/expand.c
+++ b/coreutils/expand.c
@@ -132,10 +132,10 @@ int expand_main(int argc UNUSED_PARAM, char **argv)
132#endif 132#endif
133 133
134 if (ENABLE_EXPAND && (!ENABLE_UNEXPAND || applet_name[0] == 'e')) { 134 if (ENABLE_EXPAND && (!ENABLE_UNEXPAND || applet_name[0] == 'e')) {
135 USE_FEATURE_EXPAND_LONG_OPTIONS(applet_long_options = expand_longopts); 135 IF_FEATURE_EXPAND_LONG_OPTIONS(applet_long_options = expand_longopts);
136 opt = getopt32(argv, "it:", &opt_t); 136 opt = getopt32(argv, "it:", &opt_t);
137 } else { 137 } else {
138 USE_FEATURE_UNEXPAND_LONG_OPTIONS(applet_long_options = unexpand_longopts); 138 IF_FEATURE_UNEXPAND_LONG_OPTIONS(applet_long_options = unexpand_longopts);
139 /* -t NUM sets also -a */ 139 /* -t NUM sets also -a */
140 opt_complementary = "ta"; 140 opt_complementary = "ta";
141 opt = getopt32(argv, "ft:a", &opt_t); 141 opt = getopt32(argv, "ft:a", &opt_t);
@@ -157,9 +157,9 @@ int expand_main(int argc UNUSED_PARAM, char **argv)
157 } 157 }
158 158
159 if (ENABLE_EXPAND && (!ENABLE_UNEXPAND || applet_name[0] == 'e')) 159 if (ENABLE_EXPAND && (!ENABLE_UNEXPAND || applet_name[0] == 'e'))
160 USE_EXPAND(expand(file, tab_size, opt)); 160 IF_EXPAND(expand(file, tab_size, opt));
161 else 161 else
162 USE_UNEXPAND(unexpand(file, tab_size, opt)); 162 IF_UNEXPAND(unexpand(file, tab_size, opt));
163 163
164 /* Check and close the file */ 164 /* Check and close the file */
165 if (fclose_if_not_stdin(file)) { 165 if (fclose_if_not_stdin(file)) {