message string changes, mostly for consistency, also -32 bytes in .rodata

9 files changed, 14 insertions, 14 deletions

diff --git a/e2fsprogs/blkid/cache.c b/e2fsprogs/blkid/cache.c
index 57118e1d4..9bae6fb67 100644
--- a/e2fsprogs/blkid/cache.c
+++ b/e2fsprogs/blkid/cache.c
@@ -102,7 +102,7 @@ int main(int argc, char** argv)
 
         blkid_debug_mask = DEBUG_ALL;
         if ((argc > 2)) {
-                fprintf(stderr, "Usage: %s [filename] \n", argv[0]);
+                fprintf(stderr, "Usage: %s [filename]\n", argv[0]);
                 exit(1);
         }
 
diff --git a/e2fsprogs/blkid/devno.c b/e2fsprogs/blkid/devno.c
index be93666be..4f3dd93cd 100644
--- a/e2fsprogs/blkid/devno.c
+++ b/e2fsprogs/blkid/devno.c
@@ -170,7 +170,7 @@ char *blkid_devno_to_devname(dev_t devno)
 
         if (!devname) {
                 DBG(DEBUG_DEVNO,
-                    printf("blkid: couldn't find devno 0x%04lx\n",
+                    printf("blkid: cannot find devno 0x%04lx\n",
                            (unsigned long) devno));
         } else {
                 DBG(DEBUG_DEVNO,
diff --git a/e2fsprogs/blkid/tag.c b/e2fsprogs/blkid/tag.c
index 09712bab7..3bbd4c1f4 100644
--- a/e2fsprogs/blkid/tag.c
+++ b/e2fsprogs/blkid/tag.c
@@ -408,7 +408,7 @@ int main(int argc, char **argv)
 
         dev = blkid_get_dev(cache, devname, flags);
         if (!dev) {
-                fprintf(stderr, "%s: Can not find device in blkid cache\n");
+                fprintf(stderr, "%s: cannot find device in blkid cache\n");
                 exit(1);
         }
         if (search_type) {
diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c
index 28139f4ea..77edbd871 100644
--- a/e2fsprogs/e2fsck.c
+++ b/e2fsprogs/e2fsck.c
@@ -6721,7 +6721,7 @@ static int update_dir_block(ext2_filsys fs FSCK_ATTR((unused)),
  * Then, pass3 interates over all directory inodes; for each directory
  * it attempts to trace up the filesystem tree, using dirinfo.parent
  * until it reaches a directory which has been marked "done".  If it
- * can not do so, then the directory must be disconnected, and e2fsck
+ * cannot do so, then the directory must be disconnected, and e2fsck
  * will offer to reconnect it to /lost+found.  While it is chasing
  * parent pointers up the filesystem tree, if pass3 sees a directory
  * twice, then it has detected a filesystem loop, and it will again
@@ -8587,7 +8587,7 @@ static const struct e2fsck_problem problem_table[] = {
 
         /* Bad primary block */
         { PR_1_BAD_PRIMARY_BLOCK,
-          N_("\nIf the @b is really bad, the @f can not be fixed.\n"),
+          N_("\nIf the @b is really bad, the @f cannot be fixed.\n"),
           PROMPT_NONE, PR_AFTER_CODE, PR_1_BAD_PRIMARY_BLOCK_PROMPT },
 
         /* Bad primary block prompt */
@@ -8952,7 +8952,7 @@ static const struct e2fsck_problem problem_table[] = {
 
         /* File has duplicate blocks */
         { PR_1D_DUP_FILE,
-          N_("File %Q (@i #%i, mod time %IM) \n"
+          N_("File %Q (@i #%i, mod time %IM)\n"
           "  has %B @m @b(s), shared with %N file(s):\n"),
           PROMPT_NONE, 0 },
 
diff --git a/e2fsprogs/ext2fs/test_io.c b/e2fsprogs/ext2fs/test_io.c
index fb029e2f1..bd74225c0 100644
--- a/e2fsprogs/ext2fs/test_io.c
+++ b/e2fsprogs/ext2fs/test_io.c
@@ -111,7 +111,7 @@ static void test_dump_block(io_channel channel,
         for (i=0, cp = buf; i < channel->block_size; i++, cp++) {
                 cksum += *cp;
         }
-        fprintf(f, "Contents of block %lu, checksum %08lu: \n", block, cksum);
+        fprintf(f, "Contents of block %lu, checksum %08lu:\n", block, cksum);
         for (i=0, cp = buf; i < channel->block_size; i++, cp++) {
                 if ((i % 16) == 0)
                         fprintf(f, "%04x: ", i);
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
index e2f600329..06ba4b206 100644
--- a/e2fsprogs/fsck.c
+++ b/e2fsprogs/fsck.c
@@ -102,7 +102,7 @@ struct fsck_instance {
  * Return the "base device" given a particular device; this is used to
  * assure that we only fsck one partition on a particular drive at any
  * one time.  Otherwise, the disk heads will be seeking all over the
- * place.  If the base device can not be determined, return NULL.
+ * place.  If the base device cannot be determined, return NULL.
  *
  * The base_device() function returns an allocated string which must
  * be freed.
diff --git a/e2fsprogs/mke2fs.c b/e2fsprogs/mke2fs.c
index f2cce75a3..30110f8b6 100644
--- a/e2fsprogs/mke2fs.c
+++ b/e2fsprogs/mke2fs.c
@@ -247,7 +247,7 @@ static void test_disk(ext2_filsys fs, badblocks_list *bb_list)
         mke2fs_verbose("Running command: %s\n", buf);
         f = popen(buf, "r");
         if (!f) {
-                bb_perror_msg_and_die("Could not run '%s'", buf);
+                bb_perror_msg_and_die("cannot run '%s'", buf);
         }
         retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block);
         pclose(f);
@@ -1332,7 +1332,7 @@ int mke2fs_main (int argc, char *argv[])
                         retval = zero_blocks(fs, start, blocks - start,
                                              NULL, &ret_blk, NULL);
 
-                mke2fs_warning_msg(retval, "could not zero block %u at end of filesystem", ret_blk);
+                mke2fs_warning_msg(retval, "cannot zero block %u at end of filesystem", ret_blk);
                 write_inode_tables(fs);
                 create_root_dir(fs);
                 create_lost_and_found(fs);
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index 01ba31c68..d22deede2 100644
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -615,7 +615,7 @@ int tune2fs_main(int argc, char **argv)
         }
         retval = ext2fs_check_if_mounted(device_name, &mount_flags);
         if (retval)
-                bb_error_msg_and_die("Could not determine if %s is mounted", device_name);
+                bb_error_msg_and_die("cannot determine if %s is mounted", device_name);
         /* Normally we only need to write out the superblock */
         fs->flags |= EXT2_FLAG_SUPER_ONLY;
 
diff --git a/e2fsprogs/util.c b/e2fsprogs/util.c
index e68c457e7..b30c294b8 100644
--- a/e2fsprogs/util.c
+++ b/e2fsprogs/util.c
@@ -82,7 +82,7 @@ void check_mount(const char *device, int force, const char *type)
 
         retval = ext2fs_check_if_mounted(device, &mount_flags);
         if (retval) {
-                bb_error_msg("Could not determine if %s is mounted", device);
+                bb_error_msg("cannot determine if %s is mounted", device);
                 return;
         }
         if (mount_flags & EXT2_MF_MOUNTED) {
@@ -219,7 +219,7 @@ void make_journal_device(char *journal_device, ext2_filsys fs, int quiet, int fo
                                         EXT2_FLAG_JOURNAL_DEV_OK, 0,
                                         fs->blocksize, io_ptr, &jfs);
         if (retval)
-                bb_error_msg_and_die("Could not journal device %s", journal_device);
+                bb_error_msg_and_die("cannot journal device %s", journal_device);
         if(!quiet)
                 printf("Adding journal to device %s: ", journal_device);
         fflush(stdout);
@@ -248,7 +248,7 @@ void make_journal_blocks(ext2_filsys fs, int journal_size, int journal_flags, in
         retval = ext2fs_add_journal_inode(fs, journal_blocks,
                                                   journal_flags);
         if(retval)
-                bb_error_msg_and_die("Could not create journal");
+                bb_error_msg_and_die("cannot create journal");
         if(!quiet)
                 puts("done");
 }