svn commit: trunk/busybox: archival coreutils e2fsprogs e2fsprogs/b etc...

vda at busybox.net vda at busybox.net
Fri Sep 29 21:30:46 UTC 2006


Author: vda
Date: 2006-09-29 14:30:43 -0700 (Fri, 29 Sep 2006)
New Revision: 16263

Log:
Yet another silly little byte saving. couldn't -> cannot


Modified:
   trunk/busybox/archival/gunzip.c
   trunk/busybox/archival/uncompress.c
   trunk/busybox/archival/unlzma.c
   trunk/busybox/coreutils/stty.c
   trunk/busybox/e2fsprogs/blkid/devno.c
   trunk/busybox/e2fsprogs/blkid/resolve.c
   trunk/busybox/e2fsprogs/e2fsck.c
   trunk/busybox/e2fsprogs/ext2fs/finddev.c
   trunk/busybox/e2fsprogs/fsck.c
   trunk/busybox/e2fsprogs/tune2fs.c
   trunk/busybox/libbb/get_console.c
   trunk/busybox/modutils/insmod.c
   trunk/busybox/networking/udhcp/clientpacket.c
   trunk/busybox/networking/udhcp/dhcpc.c
   trunk/busybox/networking/udhcp/dhcpd.c
   trunk/busybox/shell/hush.c
   trunk/busybox/util-linux/mdev.c


Changeset:
Modified: trunk/busybox/archival/gunzip.c
===================================================================
--- trunk/busybox/archival/gunzip.c	2006-09-29 21:04:12 UTC (rev 16262)
+++ trunk/busybox/archival/gunzip.c	2006-09-29 21:30:43 UTC (rev 16263)
@@ -119,13 +119,13 @@
 					check_header_gzip(src_fd);
 					status = inflate_gunzip(src_fd, dst_fd);
 					if (status != 0) {
-						bb_error_msg_and_die("Error inflating");
+						bb_error_msg_and_die("error inflating");
 					}
 				} else {
-					bb_error_msg_and_die("Invalid magic");
+					bb_error_msg_and_die("invalid magic");
 				}
 		} else {
-			bb_error_msg_and_die("Invalid magic");
+			bb_error_msg_and_die("invalid magic");
 		}
 
 		if ((status != EXIT_SUCCESS) && (new_path)) {
@@ -142,7 +142,7 @@
 
 		/* delete_path will be NULL if in test mode or from stdin */
 		if (delete_path && (unlink(delete_path) == -1)) {
-			bb_error_msg_and_die("Couldn't remove %s", delete_path);
+			bb_error_msg_and_die("cannot remove %s", delete_path);
 		}
 
 		free(new_path);

Modified: trunk/busybox/archival/uncompress.c
===================================================================
--- trunk/busybox/archival/uncompress.c	2006-09-29 21:04:12 UTC (rev 16262)
+++ trunk/busybox/archival/uncompress.c	2006-09-29 21:30:43 UTC (rev 16263)
@@ -84,7 +84,7 @@
 
 		/* delete_path will be NULL if in test mode or from stdin */
 		if (delete_path && (unlink(delete_path) == -1)) {
-			bb_error_msg_and_die("Couldn't remove %s", delete_path);
+			bb_error_msg_and_die("cannot remove %s", delete_path);
 		}
 
 		free(uncompressed_file);

Modified: trunk/busybox/archival/unlzma.c
===================================================================
--- trunk/busybox/archival/unlzma.c	2006-09-29 21:04:12 UTC (rev 16262)
+++ trunk/busybox/archival/unlzma.c	2006-09-29 21:30:43 UTC (rev 16263)
@@ -40,7 +40,7 @@
 		/* bug: char *extension = filename + strlen(filename) - 5; */
 		char *extension = strrchr(filename, '.');
 		if (!extension || strcmp(extension, ".lzma") != 0) {
-			bb_error_msg_and_die("Invalid extension");
+			bb_error_msg_and_die("invalid extension");
 		}
 		xstat(filename, &stat_buf);
 		*extension = '\0';
@@ -53,7 +53,7 @@
 		if (!status)
 			filename[strlen(filename)] = '.';
 		if (unlink(filename) < 0) {
-			bb_error_msg_and_die("Couldn't remove %s", filename);
+			bb_error_msg_and_die("cannot remove %s", filename);
 		}
 	}
 

Modified: trunk/busybox/coreutils/stty.c
===================================================================
--- trunk/busybox/coreutils/stty.c	2006-09-29 21:04:12 UTC (rev 16262)
+++ trunk/busybox/coreutils/stty.c	2006-09-29 21:30:43 UTC (rev 16263)
@@ -792,7 +792,7 @@
 		}
 		fdflags = fcntl(STDIN_FILENO, F_GETFL);
 		if (fdflags == -1 || fcntl(STDIN_FILENO, F_SETFL, fdflags & ~O_NONBLOCK) < 0)
-			perror_on_device_and_die("%s: couldn't reset non-blocking mode");
+			perror_on_device_and_die("%s: cannot reset non-blocking mode");
 	}
 
 	/* Initialize to all zeroes so there is no risk memcmp will report a

Modified: trunk/busybox/e2fsprogs/blkid/devno.c
===================================================================
--- trunk/busybox/e2fsprogs/blkid/devno.c	2006-09-29 21:04:12 UTC (rev 16262)
+++ trunk/busybox/e2fsprogs/blkid/devno.c	2006-09-29 21:30:43 UTC (rev 16263)
@@ -189,7 +189,7 @@
 	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)) {

Modified: trunk/busybox/e2fsprogs/blkid/resolve.c
===================================================================
--- trunk/busybox/e2fsprogs/blkid/resolve.c	2006-09-29 21:04:12 UTC (rev 16262)
+++ trunk/busybox/e2fsprogs/blkid/resolve.c	2006-09-29 21:30:43 UTC (rev 16263)
@@ -121,7 +121,7 @@
 		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);
 	}
 

Modified: trunk/busybox/e2fsprogs/e2fsck.c
===================================================================
--- trunk/busybox/e2fsprogs/e2fsck.c	2006-09-29 21:04:12 UTC (rev 16262)
+++ trunk/busybox/e2fsprogs/e2fsck.c	2006-09-29 21:30:43 UTC (rev 16263)
@@ -9132,7 +9132,7 @@
 
 	/* 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 @@
 
 	/* 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 @@
 		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;

Modified: trunk/busybox/e2fsprogs/ext2fs/finddev.c
===================================================================
--- trunk/busybox/e2fsprogs/ext2fs/finddev.c	2006-09-29 21:04:12 UTC (rev 16262)
+++ trunk/busybox/e2fsprogs/ext2fs/finddev.c	2006-09-29 21:30:43 UTC (rev 16263)
@@ -158,7 +158,7 @@
 	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 @@
 		printf("Found device!  %s\n", devname);
 		free(devname);
 	} else {
-		printf("Couldn't find device.\n");
+		printf("Cannot find device.\n");
 	}
 	return 0;
 }

Modified: trunk/busybox/e2fsprogs/fsck.c
===================================================================
--- trunk/busybox/e2fsprogs/fsck.c	2006-09-29 21:04:12 UTC (rev 16262)
+++ trunk/busybox/e2fsprogs/fsck.c	2006-09-29 21:30:43 UTC (rev 16263)
@@ -479,7 +479,7 @@
 	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 @@
 			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 @@
 	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 @@
 				 * /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 @@
 				 */
 				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;

Modified: trunk/busybox/e2fsprogs/tune2fs.c
===================================================================
--- trunk/busybox/e2fsprogs/tune2fs.c	2006-09-29 21:04:12 UTC (rev 16262)
+++ trunk/busybox/e2fsprogs/tune2fs.c	2006-09-29 21:30:43 UTC (rev 16263)
@@ -397,7 +397,7 @@
 		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));
 }

Modified: trunk/busybox/libbb/get_console.c
===================================================================
--- trunk/busybox/libbb/get_console.c	2006-09-29 21:04:12 UTC (rev 16262)
+++ trunk/busybox/libbb/get_console.c	2006-09-29 21:30:43 UTC (rev 16263)
@@ -72,6 +72,6 @@
 		}
 	}
 
-	bb_error_msg("Couldn't get a file descriptor referring to the console");
+	bb_error_msg("cannot get file descriptor referring to console");
 	return fd;                      /* total failure */
 }

Modified: trunk/busybox/modutils/insmod.c
===================================================================
--- trunk/busybox/modutils/insmod.c	2006-09-29 21:04:12 UTC (rev 16262)
+++ trunk/busybox/modutils/insmod.c	2006-09-29 21:30:43 UTC (rev 16263)
@@ -4111,7 +4111,7 @@
 		if (m_has_modinfo) {
 			m_version = new_get_module_version(f, m_strversion);
 			if (m_version == -1) {
-				bb_error_msg("couldn't find the kernel version the module was "
+				bb_error_msg("cannot find the kernel version the module was "
 						"compiled for");
 				goto out;
 			}

Modified: trunk/busybox/networking/udhcp/clientpacket.c
===================================================================
--- trunk/busybox/networking/udhcp/clientpacket.c	2006-09-29 21:04:12 UTC (rev 16262)
+++ trunk/busybox/networking/udhcp/clientpacket.c	2006-09-29 21:30:43 UTC (rev 16263)
@@ -172,7 +172,7 @@
 	memset(&packet, 0, sizeof(struct udp_dhcp_packet));
 	bytes = read(fd, &packet, sizeof(struct udp_dhcp_packet));
 	if (bytes < 0) {
-		DEBUG("Couldn't read on raw listening socket - ignoring");
+		DEBUG("Cannot read on raw listening socket - ignoring");
 		usleep(500000); /* possible down interface, looping condition */
 		return -1;
 	}

Modified: trunk/busybox/networking/udhcp/dhcpc.c
===================================================================
--- trunk/busybox/networking/udhcp/dhcpc.c	2006-09-29 21:04:12 UTC (rev 16262)
+++ trunk/busybox/networking/udhcp/dhcpc.c	2006-09-29 21:30:43 UTC (rev 16263)
@@ -320,7 +320,7 @@
 			else
 				fd = raw_socket(client_config.ifindex);
 			if (fd < 0) {
-				bb_perror_msg("FATAL: couldn't listen on socket");
+				bb_perror_msg("FATAL: cannot listen on socket");
 				return 0;
 			}
 		}

Modified: trunk/busybox/networking/udhcp/dhcpd.c
===================================================================
--- trunk/busybox/networking/udhcp/dhcpd.c	2006-09-29 21:04:12 UTC (rev 16262)
+++ trunk/busybox/networking/udhcp/dhcpd.c	2006-09-29 21:30:43 UTC (rev 16263)
@@ -90,7 +90,7 @@
 
 		if (server_socket < 0)
 			if ((server_socket = listen_socket(INADDR_ANY, SERVER_PORT, server_config.interface)) < 0) {
-				bb_perror_msg("FATAL: couldn't create server socket");
+				bb_perror_msg("FATAL: cannot create server socket");
 				return 2;
 			}
 
@@ -137,7 +137,7 @@
 		}
 
 		if ((state = get_option(&packet, DHCP_MESSAGE_TYPE)) == NULL) {
-			bb_error_msg("Couldn't get option from packet, ignoring");
+			bb_error_msg("cannot get option from packet, ignoring");
 			continue;
 		}
 
@@ -165,7 +165,7 @@
 			DEBUG("Received DISCOVER");
 
 			if (sendOffer(&packet) < 0) {
-				bb_error_msg("Send OFFER failed");
+				bb_error_msg("send OFFER failed");
 			}
 			break;
 		case DHCPREQUEST:

Modified: trunk/busybox/shell/hush.c
===================================================================
--- trunk/busybox/shell/hush.c	2006-09-29 21:04:12 UTC (rev 16262)
+++ trunk/busybox/shell/hush.c	2006-09-29 21:30:43 UTC (rev 16263)
@@ -717,7 +717,7 @@
 	/* XXX search through $PATH is missing */
 	input = fopen(child->argv[1], "r");
 	if (!input) {
-		bb_error_msg("Couldn't open file '%s'", child->argv[1]);
+		bb_error_msg("cannot open '%s'", child->argv[1]);
 		return EXIT_FAILURE;
 	}
 
@@ -1120,7 +1120,7 @@
 #endif
 		debug_printf("exec of %s\n",child->argv[0]);
 		execvp(child->argv[0],child->argv);
-		bb_perror_msg("couldn't exec: %s",child->argv[0]);
+		bb_perror_msg("cannot exec: %s",child->argv[0]);
 		_exit(1);
 	} else if (child->group) {
 		debug_printf("runtime nesting to group\n");

Modified: trunk/busybox/util-linux/mdev.c
===================================================================
--- trunk/busybox/util-linux/mdev.c	2006-09-29 21:04:12 UTC (rev 16262)
+++ trunk/busybox/util-linux/mdev.c	2006-09-29 21:30:43 UTC (rev 16263)
@@ -185,7 +185,7 @@
 		putenv(s);
 		free(s);
 		free(command);
-		if (rc == -1) bb_perror_msg_and_die("Couldn't run %s", command);
+		if (rc == -1) bb_perror_msg_and_die("cannot run %s", command);
 	}
 	if (delete) unlink(device_name);
 }




More information about the busybox-cvs mailing list