diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-18 22:04:09 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-18 22:04:09 +0000 |
commit | 89f0b3486dfea233e6000f9af95b39a3ea7fd96e (patch) | |
tree | fc0d65e0d33b5b526b0d44d4c4da8143be3b53b1 /util-linux | |
parent | 61126ab30a90b74e45a79ccb97074ab71afa6054 (diff) | |
download | busybox-w32-89f0b3486dfea233e6000f9af95b39a3ea7fd96e.tar.gz busybox-w32-89f0b3486dfea233e6000f9af95b39a3ea7fd96e.tar.bz2 busybox-w32-89f0b3486dfea233e6000f9af95b39a3ea7fd96e.zip |
rodata cleanup. "unable to" == "cannot". -300 bytes
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/fdisk.c | 8 | ||||
-rw-r--r-- | util-linux/fdisk_sgi.c | 4 | ||||
-rw-r--r-- | util-linux/fsck_minix.c | 2 | ||||
-rw-r--r-- | util-linux/mkfs_minix.c | 14 |
4 files changed, 14 insertions, 14 deletions
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index e47406b3c..bd2f1e87f 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c | |||
@@ -441,7 +441,7 @@ static const struct systypes i386_sys_types[] = { | |||
441 | { "\x07" "HPFS/NTFS" }, /* OS/2 IFS, eg, HPFS or NTFS or QNX */ | 441 | { "\x07" "HPFS/NTFS" }, /* OS/2 IFS, eg, HPFS or NTFS or QNX */ |
442 | { "\x0a" "OS/2 Boot Manager" },/* OS/2 Boot Manager */ | 442 | { "\x0a" "OS/2 Boot Manager" },/* OS/2 Boot Manager */ |
443 | { "\x0b" "Win95 FAT32" }, | 443 | { "\x0b" "Win95 FAT32" }, |
444 | { "\x0c" "Win95 FAT32 (LBA)" },/* LBA really is `Extended Int 13h' */ | 444 | { "\x0c" "Win95 FAT32 (LBA)" },/* LBA really is 'Extended Int 13h' */ |
445 | { "\x0e" "Win95 FAT16 (LBA)" }, | 445 | { "\x0e" "Win95 FAT16 (LBA)" }, |
446 | { "\x0f" "Win95 Ext'd (LBA)" }, | 446 | { "\x0f" "Win95 Ext'd (LBA)" }, |
447 | { "\x11" "Hidden FAT12" }, | 447 | { "\x11" "Hidden FAT12" }, |
@@ -1053,7 +1053,7 @@ read_extended(int ext) | |||
1053 | if (partitions >= MAXIMUM_PARTS) { | 1053 | if (partitions >= MAXIMUM_PARTS) { |
1054 | /* This is not a Linux restriction, but | 1054 | /* This is not a Linux restriction, but |
1055 | this program uses arrays of size MAXIMUM_PARTS. | 1055 | this program uses arrays of size MAXIMUM_PARTS. |
1056 | Do not try to `improve' this test. */ | 1056 | Do not try to 'improve' this test. */ |
1057 | struct pte *pre = &ptes[partitions-1]; | 1057 | struct pte *pre = &ptes[partitions-1]; |
1058 | #ifdef CONFIG_FEATURE_FDISK_WRITABLE | 1058 | #ifdef CONFIG_FEATURE_FDISK_WRITABLE |
1059 | printf(_("Warning: deleting partitions after %d\n"), | 1059 | printf(_("Warning: deleting partitions after %d\n"), |
@@ -1716,7 +1716,7 @@ change_sysid(void) | |||
1716 | printf(_("Type 0 means free space to many systems\n" | 1716 | printf(_("Type 0 means free space to many systems\n" |
1717 | "(but not to Linux). Having partitions of\n" | 1717 | "(but not to Linux). Having partitions of\n" |
1718 | "type 0 is probably unwise. You can delete\n" | 1718 | "type 0 is probably unwise. You can delete\n" |
1719 | "a partition using the `d' command.\n")); | 1719 | "a partition using the 'd' command.\n")); |
1720 | /* break; */ | 1720 | /* break; */ |
1721 | } | 1721 | } |
1722 | 1722 | ||
@@ -2434,7 +2434,7 @@ new_partition(void) | |||
2434 | } | 2434 | } |
2435 | else | 2435 | else |
2436 | printf(_("Invalid partition number " | 2436 | printf(_("Invalid partition number " |
2437 | "for type `%c'\n"), c); | 2437 | "for type '%c'\n"), c); |
2438 | } | 2438 | } |
2439 | } | 2439 | } |
2440 | } | 2440 | } |
diff --git a/util-linux/fdisk_sgi.c b/util-linux/fdisk_sgi.c index 8d6837f77..9d444c0be 100644 --- a/util-linux/fdisk_sgi.c +++ b/util-linux/fdisk_sgi.c | |||
@@ -720,7 +720,7 @@ sgi_add_partition(int n, int sys) | |||
720 | first = read_int(0, 0, last-1, 0, mesg); | 720 | first = read_int(0, 0, last-1, 0, mesg); |
721 | if (first != 0) { | 721 | if (first != 0) { |
722 | printf(_("It is highly recommended that eleventh partition\n" | 722 | printf(_("It is highly recommended that eleventh partition\n" |
723 | "covers the entire disk and is of type `SGI volume'\n")); | 723 | "covers the entire disk and is of type 'SGI volume'\n")); |
724 | } | 724 | } |
725 | } else { | 725 | } else { |
726 | first = freelist[0].first; | 726 | first = freelist[0].first; |
@@ -749,7 +749,7 @@ sgi_add_partition(int n, int sys) | |||
749 | last = last; /* align to cylinder if You know how ... */ | 749 | last = last; /* align to cylinder if You know how ... */ |
750 | if ( (sys == SGI_VOLUME) && (first != 0 || last != sgi_get_lastblock() ) ) | 750 | if ( (sys == SGI_VOLUME) && (first != 0 || last != sgi_get_lastblock() ) ) |
751 | printf(_("It is highly recommended that eleventh partition\n" | 751 | printf(_("It is highly recommended that eleventh partition\n" |
752 | "covers the entire disk and is of type `SGI volume'\n")); | 752 | "covers the entire disk and is of type 'SGI volume'\n")); |
753 | sgi_set_partition(n, first, last-first, sys); | 753 | sgi_set_partition(n, first, last-first, sys); |
754 | } | 754 | } |
755 | 755 | ||
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index 3ebc58b1f..9c831bd59 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) | |||
445 | return; | 445 | return; |
446 | } | 446 | } |
447 | if (BLOCK_SIZE * nr != lseek(IN, BLOCK_SIZE * nr, SEEK_SET)) { | 447 | if (BLOCK_SIZE * nr != lseek(IN, BLOCK_SIZE * nr, SEEK_SET)) { |
448 | printf("%s: unable to seek to block in file '%s'\n", | 448 | printf("%s: cannot seek to block in file '%s'\n", |
449 | bb_msg_read_error, current_name); | 449 | bb_msg_read_error, current_name); |
450 | errors_uncorrected = 1; | 450 | errors_uncorrected = 1; |
451 | memset(addr, 0, BLOCK_SIZE); | 451 | memset(addr, 0, BLOCK_SIZE); |
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index b154f4ab9..5cdbfead9 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c | |||
@@ -312,17 +312,17 @@ static void write_tables(void) | |||
312 | if (lseek(DEV, 0, SEEK_SET)) | 312 | if (lseek(DEV, 0, SEEK_SET)) |
313 | bb_error_msg_and_die("seek to boot block failed in write_tables"); | 313 | bb_error_msg_and_die("seek to boot block failed in write_tables"); |
314 | if (512 != write(DEV, boot_block_buffer, 512)) | 314 | if (512 != write(DEV, boot_block_buffer, 512)) |
315 | bb_error_msg_and_die("unable to clear boot sector"); | 315 | bb_error_msg_and_die("cannot clear boot sector"); |
316 | if (BLOCK_SIZE != lseek(DEV, BLOCK_SIZE, SEEK_SET)) | 316 | if (BLOCK_SIZE != lseek(DEV, BLOCK_SIZE, SEEK_SET)) |
317 | bb_error_msg_and_die("seek failed in write_tables"); | 317 | bb_error_msg_and_die("seek failed in write_tables"); |
318 | if (BLOCK_SIZE != write(DEV, super_block_buffer, BLOCK_SIZE)) | 318 | if (BLOCK_SIZE != write(DEV, super_block_buffer, BLOCK_SIZE)) |
319 | bb_error_msg_and_die("unable to write super-block"); | 319 | bb_error_msg_and_die("cannot write super-block"); |
320 | if (IMAPS * BLOCK_SIZE != write(DEV, inode_map, IMAPS * BLOCK_SIZE)) | 320 | if (IMAPS * BLOCK_SIZE != write(DEV, inode_map, IMAPS * BLOCK_SIZE)) |
321 | bb_error_msg_and_die("unable to write inode map"); | 321 | bb_error_msg_and_die("cannot write inode map"); |
322 | if (ZMAPS * BLOCK_SIZE != write(DEV, zone_map, ZMAPS * BLOCK_SIZE)) | 322 | if (ZMAPS * BLOCK_SIZE != write(DEV, zone_map, ZMAPS * BLOCK_SIZE)) |
323 | bb_error_msg_and_die("unable to write zone map"); | 323 | bb_error_msg_and_die("cannot write zone map"); |
324 | if (INODE_BUFFER_SIZE != write(DEV, inode_buffer, INODE_BUFFER_SIZE)) | 324 | if (INODE_BUFFER_SIZE != write(DEV, inode_buffer, INODE_BUFFER_SIZE)) |
325 | bb_error_msg_and_die("unable to write inodes"); | 325 | bb_error_msg_and_die("cannot write inodes"); |
326 | 326 | ||
327 | } | 327 | } |
328 | 328 | ||
@@ -570,7 +570,7 @@ static void setup_tables(void) | |||
570 | * /sbin/mkfs.minix -i 200 test.fs | 570 | * /sbin/mkfs.minix -i 200 test.fs |
571 | * */ | 571 | * */ |
572 | if (i >= 999) { | 572 | if (i >= 999) { |
573 | bb_error_msg_and_die("unable to allocate buffers for maps"); | 573 | bb_error_msg_and_die("cannot allocate buffers for maps"); |
574 | } | 574 | } |
575 | FIRSTZONE = NORM_FIRSTZONE; | 575 | FIRSTZONE = NORM_FIRSTZONE; |
576 | inode_map = xmalloc(IMAPS * BLOCK_SIZE); | 576 | inode_map = xmalloc(IMAPS * BLOCK_SIZE); |
@@ -807,7 +807,7 @@ goodbye: | |||
807 | strcpy(tmp + 2, ".badblocks"); | 807 | strcpy(tmp + 2, ".badblocks"); |
808 | DEV = xopen(device_name, O_RDWR); | 808 | DEV = xopen(device_name, O_RDWR); |
809 | if (fstat(DEV, &statbuf) < 0) | 809 | if (fstat(DEV, &statbuf) < 0) |
810 | bb_error_msg_and_die("unable to stat %s", device_name); | 810 | bb_error_msg_and_die("cannot stat %s", device_name); |
811 | if (!S_ISBLK(statbuf.st_mode)) | 811 | if (!S_ISBLK(statbuf.st_mode)) |
812 | check = 0; | 812 | check = 0; |
813 | else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340) | 813 | else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340) |