From a959588b80529ef5e02048ed71f3c7bf9a117217 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko
Date: Fri, 29 Sep 2006 21:30:43 +0000
Subject: Yet another silly little byte saving. couldn't -> cannot

---
 e2fsprogs/blkid/devno.c    |  2 +-
 e2fsprogs/blkid/resolve.c  |  2 +-
 e2fsprogs/e2fsck.c         |  6 +++---
 e2fsprogs/ext2fs/finddev.c |  4 ++--
 e2fsprogs/fsck.c           | 14 +++++++-------
 e2fsprogs/tune2fs.c        |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'e2fsprogs')

diff --git a/e2fsprogs/blkid/devno.c b/e2fsprogs/blkid/devno.c
index f3fa5c0..065761f 100644
--- a/e2fsprogs/blkid/devno.c
+++ b/e2fsprogs/blkid/devno.c
@@ -189,7 +189,7 @@ int main(int argc, char** argv)
 	char	*devname, *tmp;
 	int	major, minor;
 	dev_t	devno;
-	const char *errmsg = "Couldn't parse %s: %s\n";
+	const char *errmsg = "Cannot parse %s: %s\n";
 
 	blkid_debug_mask = DEBUG_ALL;
 	if ((argc != 2) && (argc != 3)) {
diff --git a/e2fsprogs/blkid/resolve.c b/e2fsprogs/blkid/resolve.c
index 4c43830..c6f54a2 100644
--- a/e2fsprogs/blkid/resolve.c
+++ b/e2fsprogs/blkid/resolve.c
@@ -121,7 +121,7 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 	if (blkid_get_cache(&cache, bb_dev_null) < 0) {
-		fprintf(stderr, "Couldn't get blkid cache\n");
+		fprintf(stderr, "cannot get blkid cache\n");
 		exit(1);
 	}
 
diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c
index 7ffc0d2..28139f4 100644
--- a/e2fsprogs/e2fsck.c
+++ b/e2fsprogs/e2fsck.c
@@ -9132,7 +9132,7 @@ static const struct e2fsck_problem problem_table[] = {
 
 	/* Internal error: couldn't find dir_info */
 	{ PR_2_NO_DIRINFO,
-	  N_("Internal error: couldn't find dir_info for %i.\n"),
+	  N_("Internal error: cannot find dir_info for %i.\n"),
 	  PROMPT_NONE, PR_FATAL },
 
 	/* Final rec_len is wrong */
@@ -9408,7 +9408,7 @@ static const struct e2fsck_problem problem_table[] = {
 
 	/* Internal error: couldn't find dir_info */
 	{ PR_3_NO_DIRINFO,
-	  N_("Internal error: couldn't find dir_info for %i.\n"),
+	  N_("Internal error: cannot find dir_info for %i.\n"),
 	  PROMPT_NONE, PR_FATAL },
 
 	/* Lost+found not a directory */
@@ -12915,7 +12915,7 @@ static void reserve_stdio_fds(void)
 		if (fd > 2)
 			break;
 		if (fd < 0) {
-			fprintf(stderr, _("ERROR: Couldn't open "
+			fprintf(stderr, _("ERROR: Cannot open "
 				"/dev/null (%s)\n"),
 				strerror(errno));
 			break;
diff --git a/e2fsprogs/ext2fs/finddev.c b/e2fsprogs/ext2fs/finddev.c
index 1261d15..4dda916 100644
--- a/e2fsprogs/ext2fs/finddev.c
+++ b/e2fsprogs/ext2fs/finddev.c
@@ -158,7 +158,7 @@ int main(int argc, char** argv)
 	char	*devname, *tmp;
 	int	major, minor;
 	dev_t	device;
-	const char *errmsg = "Couldn't parse %s: %s\n";
+	const char *errmsg = "Cannot parse %s: %s\n";
 
 	if ((argc != 2) && (argc != 3)) {
 		fprintf(stderr, "Usage: %s device_number\n", argv[0]);
@@ -191,7 +191,7 @@ int main(int argc, char** argv)
 		printf("Found device!  %s\n", devname);
 		free(devname);
 	} else {
-		printf("Couldn't find device.\n");
+		printf("Cannot find device.\n");
 	}
 	return 0;
 }
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
index 99ffed1..e2f6003 100644
--- a/e2fsprogs/fsck.c
+++ b/e2fsprogs/fsck.c
@@ -479,7 +479,7 @@ static void load_fs_info(const char *filename)
 	struct fs_info *fs;
 
 	if ((f = fopen(filename, "r")) == NULL) {
-		bb_perror_msg("WARNING: couldn't open %s", filename);
+		bb_perror_msg("WARNING: cannot open %s", filename);
 		return;
 	}
 	while (!feof(f)) {
@@ -717,7 +717,7 @@ static struct fsck_instance *wait_one(int flags)
 			if ((errno == EINTR) || (errno == EAGAIN))
 				continue;
 			if (errno == ECHILD) {
-				bb_error_msg("wait: No more child process?!?");
+				bb_error_msg("wait: no more child process?!?");
 				return NULL;
 			}
 			perror("wait");
@@ -840,7 +840,7 @@ static void fsck_device(struct fs_info *fs, int interactive)
 	num_running++;
 	retval = execute(type, fs->device, fs->mountpt, interactive);
 	if (retval) {
-		bb_error_msg("Error %d while executing fsck.%s for %s",
+		bb_error_msg("error %d while executing fsck.%s for %s",
 						retval, type, fs->device);
 		num_running--;
 	}
@@ -1208,8 +1208,8 @@ static void PRS(int argc, char *argv[])
 				 * /proc/partitions isn't found.
 				 */
 				if (access("/proc/partitions", R_OK) < 0) {
-					bb_error_msg_and_die("Couldn't open /proc/partitions: %m\n"
-							"Is /proc mounted?");
+					bb_perror_msg_and_die("cannot open /proc/partitions "
+							"(is /proc mounted?)");
 				}
 				/*
 				 * Check to see if this is because
@@ -1217,10 +1217,10 @@ static void PRS(int argc, char *argv[])
 				 */
 				if (geteuid())
 					bb_error_msg_and_die(
-		"Must be root to scan for matching filesystems: %s\n", arg);
+		"must be root to scan for matching filesystems: %s\n", arg);
 				else
 					bb_error_msg_and_die(
-		"Couldn't find matching filesystem: %s", arg);
+		"cannot find matching filesystem: %s", arg);
 			}
 			devices[num_devices++] = dev ? dev : string_copy(arg);
 			continue;
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index fba8b6c..d64c128 100644
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -397,7 +397,7 @@ static time_t parse_time(char *str)
 		ts.tm_mday = 0;
 #endif
 	if (ts.tm_mday == 0) {
-		bb_error_msg_and_die("Couldn't parse date/time specifier: %s", str);
+		bb_error_msg_and_die("Cannot parse date/time specifier: %s", str);
 	}
 	return (mktime(&ts));
 }
-- 
cgit v1.1