From 89f0b3486dfea233e6000f9af95b39a3ea7fd96e Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sat, 18 Nov 2006 22:04:09 +0000 Subject: rodata cleanup. "unable to" == "cannot". -300 bytes --- util-linux/fdisk.c | 8 ++++---- util-linux/fdisk_sgi.c | 4 ++-- util-linux/fsck_minix.c | 2 +- util-linux/mkfs_minix.c | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'util-linux') diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index e47406b..bd2f1e8 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c @@ -441,7 +441,7 @@ static const struct systypes i386_sys_types[] = { { "\x07" "HPFS/NTFS" }, /* OS/2 IFS, eg, HPFS or NTFS or QNX */ { "\x0a" "OS/2 Boot Manager" },/* OS/2 Boot Manager */ { "\x0b" "Win95 FAT32" }, - { "\x0c" "Win95 FAT32 (LBA)" },/* LBA really is `Extended Int 13h' */ + { "\x0c" "Win95 FAT32 (LBA)" },/* LBA really is 'Extended Int 13h' */ { "\x0e" "Win95 FAT16 (LBA)" }, { "\x0f" "Win95 Ext'd (LBA)" }, { "\x11" "Hidden FAT12" }, @@ -1053,7 +1053,7 @@ read_extended(int ext) if (partitions >= MAXIMUM_PARTS) { /* This is not a Linux restriction, but this program uses arrays of size MAXIMUM_PARTS. - Do not try to `improve' this test. */ + Do not try to 'improve' this test. */ struct pte *pre = &ptes[partitions-1]; #ifdef CONFIG_FEATURE_FDISK_WRITABLE printf(_("Warning: deleting partitions after %d\n"), @@ -1716,7 +1716,7 @@ change_sysid(void) printf(_("Type 0 means free space to many systems\n" "(but not to Linux). Having partitions of\n" "type 0 is probably unwise. You can delete\n" - "a partition using the `d' command.\n")); + "a partition using the 'd' command.\n")); /* break; */ } @@ -2434,7 +2434,7 @@ new_partition(void) } else printf(_("Invalid partition number " - "for type `%c'\n"), c); + "for type '%c'\n"), c); } } } diff --git a/util-linux/fdisk_sgi.c b/util-linux/fdisk_sgi.c index 8d6837f..9d444c0 100644 --- a/util-linux/fdisk_sgi.c +++ b/util-linux/fdisk_sgi.c @@ -720,7 +720,7 @@ sgi_add_partition(int n, int sys) first = read_int(0, 0, last-1, 0, mesg); if (first != 0) { printf(_("It is highly recommended that eleventh partition\n" - "covers the entire disk and is of type `SGI volume'\n")); + "covers the entire disk and is of type 'SGI volume'\n")); } } else { first = freelist[0].first; @@ -749,7 +749,7 @@ sgi_add_partition(int n, int sys) last = last; /* align to cylinder if You know how ... */ if ( (sys == SGI_VOLUME) && (first != 0 || last != sgi_get_lastblock() ) ) printf(_("It is highly recommended that eleventh partition\n" - "covers the entire disk and is of type `SGI volume'\n")); + "covers the entire disk and is of type 'SGI volume'\n")); sgi_set_partition(n, first, last-first, sys); } diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index 3ebc58b..9c831bd 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c @@ -445,7 +445,7 @@ static void read_block(unsigned int nr, char *addr) return; } if (BLOCK_SIZE * nr != lseek(IN, BLOCK_SIZE * nr, SEEK_SET)) { - printf("%s: unable to seek to block in file '%s'\n", + printf("%s: cannot seek to block in file '%s'\n", bb_msg_read_error, current_name); errors_uncorrected = 1; memset(addr, 0, BLOCK_SIZE); diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index b154f4a..5cdbfea 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c @@ -312,17 +312,17 @@ static void write_tables(void) if (lseek(DEV, 0, SEEK_SET)) bb_error_msg_and_die("seek to boot block failed in write_tables"); if (512 != write(DEV, boot_block_buffer, 512)) - bb_error_msg_and_die("unable to clear boot sector"); + bb_error_msg_and_die("cannot clear boot sector"); if (BLOCK_SIZE != lseek(DEV, BLOCK_SIZE, SEEK_SET)) bb_error_msg_and_die("seek failed in write_tables"); if (BLOCK_SIZE != write(DEV, super_block_buffer, BLOCK_SIZE)) - bb_error_msg_and_die("unable to write super-block"); + bb_error_msg_and_die("cannot write super-block"); if (IMAPS * BLOCK_SIZE != write(DEV, inode_map, IMAPS * BLOCK_SIZE)) - bb_error_msg_and_die("unable to write inode map"); + bb_error_msg_and_die("cannot write inode map"); if (ZMAPS * BLOCK_SIZE != write(DEV, zone_map, ZMAPS * BLOCK_SIZE)) - bb_error_msg_and_die("unable to write zone map"); + bb_error_msg_and_die("cannot write zone map"); if (INODE_BUFFER_SIZE != write(DEV, inode_buffer, INODE_BUFFER_SIZE)) - bb_error_msg_and_die("unable to write inodes"); + bb_error_msg_and_die("cannot write inodes"); } @@ -570,7 +570,7 @@ static void setup_tables(void) * /sbin/mkfs.minix -i 200 test.fs * */ if (i >= 999) { - bb_error_msg_and_die("unable to allocate buffers for maps"); + bb_error_msg_and_die("cannot allocate buffers for maps"); } FIRSTZONE = NORM_FIRSTZONE; inode_map = xmalloc(IMAPS * BLOCK_SIZE); @@ -807,7 +807,7 @@ goodbye: strcpy(tmp + 2, ".badblocks"); DEV = xopen(device_name, O_RDWR); if (fstat(DEV, &statbuf) < 0) - bb_error_msg_and_die("unable to stat %s", device_name); + bb_error_msg_and_die("cannot stat %s", device_name); if (!S_ISBLK(statbuf.st_mode)) check = 0; else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340) -- cgit v1.1