remove bb_printf and the like

1 files changed, 36 insertions, 37 deletions

diff --git a/miscutils/mountpoint.c b/miscutils/mountpoint.c
index dbc8fe0e9..b1bcab698 100644
--- a/miscutils/mountpoint.c
+++ b/miscutils/mountpoint.c
@@ -13,6 +13,8 @@
 
 int mountpoint_main(int argc, char **argv)
 {
+        struct stat st;
+        char *arg;
         int opt = getopt32(argc, argv, "qdx");
 #define OPT_q (1)
 #define OPT_d (2)
@@ -20,47 +22,44 @@ int mountpoint_main(int argc, char **argv)
 
         if (optind != argc - 1)
                 bb_show_usage();
-        {
-                char *arg = argv[optind];
-                struct stat st;
 
-                if ( (opt & OPT_x && stat(arg, &st) == 0) || (lstat(arg, &st) == 0) ) {
-                        if (opt & OPT_x) {
-                                if (S_ISBLK(st.st_mode))
-                                {
-                                        bb_printf("%u:%u\n", major(st.st_rdev),
-                                                                minor(st.st_rdev));
-                                        return EXIT_SUCCESS;
-                                } else {
-                                        if (opt & OPT_q)
-                                                putchar('\n');
-                                        else
-                                                bb_error_msg("%s: not a block device", arg);
-                                }
-                                return EXIT_FAILURE;
-                        } else
-                        if (S_ISDIR(st.st_mode)) {
-                                dev_t st_dev = st.st_dev;
-                                ino_t st_ino = st.st_ino;
-                                char *p = xasprintf("%s/..", arg);
+        arg = argv[optind];
 
-                                if (stat(p, &st) == 0) {
-                                        short ret = (st_dev != st.st_dev) ||
-                                                (st_dev == st.st_dev && st_ino == st.st_ino);
-                                        if (opt & OPT_d)
-                                                bb_printf("%u:%u\n", major(st_dev), minor(st_dev));
-                                        else if (!(opt & OPT_q))
-                                                bb_printf("%s is %sa mountpoint\n", arg, ret?"":"not ");
-                                        return !ret;
-                                }
+        if ( (opt & OPT_x && stat(arg, &st) == 0) || (lstat(arg, &st) == 0) ) {
+                if (opt & OPT_x) {
+                        if (S_ISBLK(st.st_mode)) {
+                                printf("%u:%u\n", major(st.st_rdev),
+                                                        minor(st.st_rdev));
+                                return EXIT_SUCCESS;
                         } else {
-                                if (!(opt & OPT_q))
-                                        bb_error_msg("%s: not a directory", arg);
-                                return EXIT_FAILURE;
+                                if (opt & OPT_q)
+                                        putchar('\n');
+                                else
+                                        bb_error_msg("%s: not a block device", arg);
                         }
+                        return EXIT_FAILURE;
+                } else
+                if (S_ISDIR(st.st_mode)) {
+                        dev_t st_dev = st.st_dev;
+                        ino_t st_ino = st.st_ino;
+                        char *p = xasprintf("%s/..", arg);
+
+                        if (stat(p, &st) == 0) {
+                                int ret = (st_dev != st.st_dev) ||
+                                        (st_dev == st.st_dev && st_ino == st.st_ino);
+                                if (opt & OPT_d)
+                                        printf("%u:%u\n", major(st_dev), minor(st_dev));
+                                else if (!(opt & OPT_q))
+                                        printf("%s is %sa mountpoint\n", arg, ret?"":"not ");
+                                return !ret;
+                        }
+                } else {
+                        if (!(opt & OPT_q))
+                                bb_error_msg("%s: not a directory", arg);
+                        return EXIT_FAILURE;
                 }
-                if (!(opt & OPT_q))
-                        bb_perror_msg("%s", arg);
-                return EXIT_FAILURE;
         }
+        if (!(opt & OPT_q))
+                bb_perror_msg("%s", arg);
+        return EXIT_FAILURE;
 }