*: remove some uses of argc

[oweals/busybox.git] / e2fsprogs / old_e2fsprogs / e2fsck.c

diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c
index 6ade0db16f6acc1131c022639b155d7b71f3d881..c715d3e9ae226d9cbc454575118496ec7e28b02d 100644 (file)
--- a/e2fsprogs/old_e2fsprogs/e2fsck.c
+++ b/e2fsprogs/old_e2fsprogs/e2fsck.c
@@ -1886,7 +1886,7 @@ static void e2fsck_journal_reset_super(e2fsck_t ctx, journal_superblock_t *jsb,
        int i;
 
        /* Leave a valid existing V1 superblock signature alone.
-        * Anything unrecognisable we overwrite with a new V2
+        * Anything unrecognizable we overwrite with a new V2
         * signature. */
 
        if (jsb->s_header.h_magic != htonl(JFS_MAGIC_NUMBER) ||
@@ -9400,7 +9400,7 @@ static const struct e2fsck_problem problem_table[] = {
 
        /* Cannot proceed without a root inode. */
        { PR_3_NO_ROOT_INODE_ABORT,
-         N_("Cannot proceed without a @r.\n"),
+         N_("can't proceed without a @r.\n"),
          PROMPT_NONE, PR_FATAL },
 
        /* Internal error: couldn't find dir_info */
@@ -12653,7 +12653,7 @@ static void check_mount(e2fsck_t ctx)
 
        printf(_("%s is mounted.  "), ctx->filesystem_name);
        if (!ctx->interactive)
-               bb_error_msg_and_die(_("cannot continue, aborting"));
+               bb_error_msg_and_die(_("can't continue, aborting"));
        printf(_("\n\n\007\007\007\007WARNING!!!  "
               "Running e2fsck on a mounted filesystem may cause\n"
               "SEVERE filesystem damage.\007\007\007\n\n"));
@@ -12892,7 +12892,7 @@ static int e2fsck_update_progress(e2fsck_t ctx, int pass,
 
        if (ctx->progress_fd) {
                sprintf(buf, "%d %lu %lu\n", pass, cur, max);
-               write(ctx->progress_fd, buf, strlen(buf));
+               xwrite_str(ctx->progress_fd, buf);
        } else {
                percent = calc_percent(&e2fsck_tbl, pass, cur, max);
                e2fsck_simple_progress(ctx, ctx->device_name,
@@ -13373,7 +13373,7 @@ restart:
                                 * happen, unless the hardware or
                                 * device driver is being bogus.
                                 */
-                               bb_error_msg(_("cannot set superblock flags on %s"), ctx->device_name);
+                               bb_error_msg(_("can't set superblock flags on %s"), ctx->device_name);
                                bb_error_msg_and_die(0);
                        }
                        retval = e2fsck_run_ext3_journal(ctx);