*: 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!

3 files changed, 8 insertions, 8 deletions

diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index 7c38fa11f..77fdcccb0 100644
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -124,7 +124,7 @@ int run_parts_main(int argc UNUSED_PARAM, char **argv)
         /* We require exactly one argument: the directory name */
         /* We require exactly one argument: the directory name */
         opt_complementary = "=1:a::";
-        getopt32(argv, "ra:u:t"USE_FEATURE_RUN_PARTS_FANCY("l"), &arg_list, &umask_p);
+        getopt32(argv, "ra:u:t"IF_FEATURE_RUN_PARTS_FANCY("l"), &arg_list, &umask_p);
 
         umask(xstrtou_range(umask_p, 8, 0, 07777));
 
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index ab607bde0..6726fc7c9 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -347,13 +347,13 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
         /* -xa (at least one) is required if -S is given */
         /* -q turns off -v */
         opt_complementary = "K:S:K--S:S--K:m?p:K?xpun:S?xa"
-                USE_FEATURE_START_STOP_DAEMON_FANCY("q-v");
+                IF_FEATURE_START_STOP_DAEMON_FANCY("q-v");
         opt = getopt32(argv, "KSbqtma:n:s:u:c:x:p:"
-                USE_FEATURE_START_STOP_DAEMON_FANCY("ovN:R:"),
+                IF_FEATURE_START_STOP_DAEMON_FANCY("ovN:R:"),
                 &startas, &cmdname, &signame, &userspec, &chuid, &execname, &pidfile
-                USE_FEATURE_START_STOP_DAEMON_FANCY(,&opt_N)
+                IF_FEATURE_START_STOP_DAEMON_FANCY(,&opt_N)
                 /* We accept and ignore -R <param> / --retry <param> */
-                USE_FEATURE_START_STOP_DAEMON_FANCY(,NULL)
+                IF_FEATURE_START_STOP_DAEMON_FANCY(,NULL)
         );
 
         if (opt & OPT_s) {
@@ -366,7 +366,7 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
         if (!execname) /* in case -a is given and -x is not */
                 execname = startas;
 
-//      USE_FEATURE_START_STOP_DAEMON_FANCY(
+//      IF_FEATURE_START_STOP_DAEMON_FANCY(
 //              if (retry_arg)
 //                      retries = xatoi_u(retry_arg);
 //      )
diff --git a/debianutils/which.c b/debianutils/which.c
index 748e6dc25..1558e5c6d 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -15,13 +15,13 @@
 int which_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int which_main(int argc UNUSED_PARAM, char **argv)
 {
-        USE_DESKTOP(int opt;)
+        IF_DESKTOP(int opt;)
         int status = EXIT_SUCCESS;
         char *path;
         char *p;
 
         opt_complementary = "-1"; /* at least one argument */
-        USE_DESKTOP(opt =) getopt32(argv, "a");
+        IF_DESKTOP(opt =) getopt32(argv, "a");
         argv += optind;
 
         /* This matches what is seen on e.g. ubuntu.