diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-13 09:08:27 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-13 09:08:27 +0100 |
| commit | 6331cf059ccfdf35f4e5a505cbae885094cc41b0 (patch) | |
| tree | ccb4b4f0d96d9636861a75f7fc6c97b8b15bd306 /util-linux | |
| parent | f4fee418ae9f5308b4d32bc8d4e618f779f3203f (diff) | |
| download | busybox-w32-6331cf059ccfdf35f4e5a505cbae885094cc41b0.tar.gz busybox-w32-6331cf059ccfdf35f4e5a505cbae885094cc41b0.tar.bz2 busybox-w32-6331cf059ccfdf35f4e5a505cbae885094cc41b0.zip | |
*: use "can't" instead of "cannot"
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/fsck_minix.c | 16 | ||||
| -rw-r--r-- | util-linux/ipcrm.c | 2 | ||||
| -rw-r--r-- | util-linux/mkfs_minix.c | 12 | ||||
| -rw-r--r-- | util-linux/mount.c | 4 | ||||
| -rw-r--r-- | util-linux/rdate.c | 2 | ||||
| -rw-r--r-- | util-linux/volume_id/volume_id.c | 2 |
6 files changed, 19 insertions, 19 deletions
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index cc9eec22d..18ea05fec 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c | |||
| @@ -565,7 +565,7 @@ static void write_superblock(void) | |||
| 565 | 565 | ||
| 566 | xlseek(dev_fd, BLOCK_SIZE, SEEK_SET); | 566 | xlseek(dev_fd, BLOCK_SIZE, SEEK_SET); |
| 567 | if (BLOCK_SIZE != full_write(dev_fd, superblock_buffer, BLOCK_SIZE)) | 567 | if (BLOCK_SIZE != full_write(dev_fd, superblock_buffer, BLOCK_SIZE)) |
| 568 | die("cannot write superblock"); | 568 | die("can't write superblock"); |
| 569 | } | 569 | } |
| 570 | 570 | ||
| 571 | static void write_tables(void) | 571 | static void write_tables(void) |
| @@ -573,11 +573,11 @@ static void write_tables(void) | |||
| 573 | write_superblock(); | 573 | write_superblock(); |
| 574 | 574 | ||
| 575 | if (IMAPS * BLOCK_SIZE != write(dev_fd, inode_map, IMAPS * BLOCK_SIZE)) | 575 | if (IMAPS * BLOCK_SIZE != write(dev_fd, inode_map, IMAPS * BLOCK_SIZE)) |
| 576 | die("cannot write inode map"); | 576 | die("can't write inode map"); |
| 577 | if (ZMAPS * BLOCK_SIZE != write(dev_fd, zone_map, ZMAPS * BLOCK_SIZE)) | 577 | if (ZMAPS * BLOCK_SIZE != write(dev_fd, zone_map, ZMAPS * BLOCK_SIZE)) |
| 578 | die("cannot write zone map"); | 578 | die("can't write zone map"); |
| 579 | if (INODE_BUFFER_SIZE != write(dev_fd, inode_buffer, INODE_BUFFER_SIZE)) | 579 | if (INODE_BUFFER_SIZE != write(dev_fd, inode_buffer, INODE_BUFFER_SIZE)) |
| 580 | die("cannot write inodes"); | 580 | die("can't write inodes"); |
| 581 | } | 581 | } |
| 582 | 582 | ||
| 583 | static void get_dirsize(void) | 583 | static void get_dirsize(void) |
| @@ -607,7 +607,7 @@ static void read_superblock(void) | |||
| 607 | { | 607 | { |
| 608 | xlseek(dev_fd, BLOCK_SIZE, SEEK_SET); | 608 | xlseek(dev_fd, BLOCK_SIZE, SEEK_SET); |
| 609 | if (BLOCK_SIZE != full_read(dev_fd, superblock_buffer, BLOCK_SIZE)) | 609 | if (BLOCK_SIZE != full_read(dev_fd, superblock_buffer, BLOCK_SIZE)) |
| 610 | die("cannot read superblock"); | 610 | die("can't read superblock"); |
| 611 | /* already initialized to: | 611 | /* already initialized to: |
| 612 | namelen = 14; | 612 | namelen = 14; |
| 613 | dirsize = 16; | 613 | dirsize = 16; |
| @@ -643,11 +643,11 @@ static void read_tables(void) | |||
| 643 | inode_count = xmalloc(INODES + 1); | 643 | inode_count = xmalloc(INODES + 1); |
| 644 | zone_count = xmalloc(ZONES); | 644 | zone_count = xmalloc(ZONES); |
| 645 | if (IMAPS * BLOCK_SIZE != read(dev_fd, inode_map, IMAPS * BLOCK_SIZE)) | 645 | if (IMAPS * BLOCK_SIZE != read(dev_fd, inode_map, IMAPS * BLOCK_SIZE)) |
| 646 | die("cannot read inode map"); | 646 | die("can't read inode map"); |
| 647 | if (ZMAPS * BLOCK_SIZE != read(dev_fd, zone_map, ZMAPS * BLOCK_SIZE)) | 647 | if (ZMAPS * BLOCK_SIZE != read(dev_fd, zone_map, ZMAPS * BLOCK_SIZE)) |
| 648 | die("cannot read zone map"); | 648 | die("can't read zone map"); |
| 649 | if (INODE_BUFFER_SIZE != read(dev_fd, inode_buffer, INODE_BUFFER_SIZE)) | 649 | if (INODE_BUFFER_SIZE != read(dev_fd, inode_buffer, INODE_BUFFER_SIZE)) |
| 650 | die("cannot read inodes"); | 650 | die("can't read inodes"); |
| 651 | if (NORM_FIRSTZONE != FIRSTZONE) { | 651 | if (NORM_FIRSTZONE != FIRSTZONE) { |
| 652 | printf("warning: firstzone!=norm_firstzone\n"); | 652 | printf("warning: firstzone!=norm_firstzone\n"); |
| 653 | errors_uncorrected = 1; | 653 | errors_uncorrected = 1; |
diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c index 5e18c2846..8b0b226d3 100644 --- a/util-linux/ipcrm.c +++ b/util-linux/ipcrm.c | |||
| @@ -63,7 +63,7 @@ static int remove_ids(type_id type, int argc, char **argv) | |||
| 63 | ret = shmctl(id, IPC_RMID, NULL); | 63 | ret = shmctl(id, IPC_RMID, NULL); |
| 64 | 64 | ||
| 65 | if (ret) { | 65 | if (ret) { |
| 66 | bb_perror_msg("cannot remove id %s", argv[0]); | 66 | bb_perror_msg("can't remove id %s", argv[0]); |
| 67 | nb_errors++; | 67 | nb_errors++; |
| 68 | } | 68 | } |
| 69 | } | 69 | } |
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index 8819cee4e..c6c2036ea 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c | |||
| @@ -243,22 +243,22 @@ static void write_tables(void) | |||
| 243 | msg_eol = "seek to 0 failed"; | 243 | msg_eol = "seek to 0 failed"; |
| 244 | xlseek(dev_fd, 0, SEEK_SET); | 244 | xlseek(dev_fd, 0, SEEK_SET); |
| 245 | 245 | ||
| 246 | msg_eol = "cannot clear boot sector"; | 246 | msg_eol = "can't clear boot sector"; |
| 247 | xwrite(dev_fd, G.boot_block_buffer, 512); | 247 | xwrite(dev_fd, G.boot_block_buffer, 512); |
| 248 | 248 | ||
| 249 | msg_eol = "seek to BLOCK_SIZE failed"; | 249 | msg_eol = "seek to BLOCK_SIZE failed"; |
| 250 | xlseek(dev_fd, BLOCK_SIZE, SEEK_SET); | 250 | xlseek(dev_fd, BLOCK_SIZE, SEEK_SET); |
| 251 | 251 | ||
| 252 | msg_eol = "cannot write superblock"; | 252 | msg_eol = "can't write superblock"; |
| 253 | xwrite(dev_fd, G.superblock_buffer, BLOCK_SIZE); | 253 | xwrite(dev_fd, G.superblock_buffer, BLOCK_SIZE); |
| 254 | 254 | ||
| 255 | msg_eol = "cannot write inode map"; | 255 | msg_eol = "can't write inode map"; |
| 256 | xwrite(dev_fd, G.inode_map, SB_IMAPS * BLOCK_SIZE); | 256 | xwrite(dev_fd, G.inode_map, SB_IMAPS * BLOCK_SIZE); |
| 257 | 257 | ||
| 258 | msg_eol = "cannot write zone map"; | 258 | msg_eol = "can't write zone map"; |
| 259 | xwrite(dev_fd, G.zone_map, SB_ZMAPS * BLOCK_SIZE); | 259 | xwrite(dev_fd, G.zone_map, SB_ZMAPS * BLOCK_SIZE); |
| 260 | 260 | ||
| 261 | msg_eol = "cannot write inodes"; | 261 | msg_eol = "can't write inodes"; |
| 262 | xwrite(dev_fd, G.inode_buffer, INODE_BUFFER_SIZE); | 262 | xwrite(dev_fd, G.inode_buffer, INODE_BUFFER_SIZE); |
| 263 | 263 | ||
| 264 | msg_eol = "\n"; | 264 | msg_eol = "\n"; |
| @@ -687,7 +687,7 @@ int mkfs_minix_main(int argc UNUSED_PARAM, char **argv) | |||
| 687 | 687 | ||
| 688 | xmove_fd(xopen(G.device_name, O_RDWR), dev_fd); | 688 | xmove_fd(xopen(G.device_name, O_RDWR), dev_fd); |
| 689 | if (fstat(dev_fd, &statbuf) < 0) | 689 | if (fstat(dev_fd, &statbuf) < 0) |
| 690 | bb_error_msg_and_die("cannot stat %s", G.device_name); | 690 | bb_error_msg_and_die("can't stat %s", G.device_name); |
| 691 | if (!S_ISBLK(statbuf.st_mode)) | 691 | if (!S_ISBLK(statbuf.st_mode)) |
| 692 | opt &= ~1; // clear -c (check) | 692 | opt &= ~1; // clear -c (check) |
| 693 | 693 | ||
diff --git a/util-linux/mount.c b/util-linux/mount.c index 1c5137376..30037f9ab 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
| @@ -1710,7 +1710,7 @@ static int singlemount(struct mntent *mp, int ignore_busy) | |||
| 1710 | if (errno == EPERM || errno == EACCES) | 1710 | if (errno == EPERM || errno == EACCES) |
| 1711 | bb_error_msg(bb_msg_perm_denied_are_you_root); | 1711 | bb_error_msg(bb_msg_perm_denied_are_you_root); |
| 1712 | else | 1712 | else |
| 1713 | bb_perror_msg("cannot setup loop device"); | 1713 | bb_perror_msg("can't setup loop device"); |
| 1714 | return errno; | 1714 | return errno; |
| 1715 | } | 1715 | } |
| 1716 | 1716 | ||
| @@ -1915,7 +1915,7 @@ int mount_main(int argc UNUSED_PARAM, char **argv) | |||
| 1915 | } | 1915 | } |
| 1916 | fstab = setmntent(fstabname, "r"); | 1916 | fstab = setmntent(fstabname, "r"); |
| 1917 | if (!fstab) | 1917 | if (!fstab) |
| 1918 | bb_perror_msg_and_die("cannot read %s", fstabname); | 1918 | bb_perror_msg_and_die("can't read %s", fstabname); |
| 1919 | 1919 | ||
| 1920 | // Loop through entries until we find what we're looking for | 1920 | // Loop through entries until we find what we're looking for |
| 1921 | memset(mtpair, 0, sizeof(mtpair)); | 1921 | memset(mtpair, 0, sizeof(mtpair)); |
diff --git a/util-linux/rdate.c b/util-linux/rdate.c index 0880edff5..f257d5438 100644 --- a/util-linux/rdate.c +++ b/util-linux/rdate.c | |||
| @@ -61,7 +61,7 @@ int rdate_main(int argc UNUSED_PARAM, char **argv) | |||
| 61 | bb_error_msg("current time matches remote time"); | 61 | bb_error_msg("current time matches remote time"); |
| 62 | else | 62 | else |
| 63 | if (stime(&remote_time) < 0) | 63 | if (stime(&remote_time) < 0) |
| 64 | bb_perror_msg_and_die("cannot set time of day"); | 64 | bb_perror_msg_and_die("can't set time of day"); |
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | if ((flags & 1) == 0) | 67 | if ((flags & 1) == 0) |
diff --git a/util-linux/volume_id/volume_id.c b/util-linux/volume_id/volume_id.c index 4826c2e65..c8cf946df 100644 --- a/util-linux/volume_id/volume_id.c +++ b/util-linux/volume_id/volume_id.c | |||
| @@ -223,7 +223,7 @@ struct volume_id* FAST_FUNC volume_id_open_dev_t(dev_t devt) | |||
| 223 | /* create temporary node to open block device */ | 223 | /* create temporary node to open block device */ |
| 224 | unlink(tmp_node); | 224 | unlink(tmp_node); |
| 225 | if (mknod(tmp_node, (S_IFBLK | 0600), devt) != 0) | 225 | if (mknod(tmp_node, (S_IFBLK | 0600), devt) != 0) |
| 226 | bb_perror_msg_and_die("cannot mknod(%s)", tmp_node); | 226 | bb_perror_msg_and_die("can't mknod(%s)", tmp_node); |
| 227 | 227 | ||
| 228 | id = volume_id_open_node(tmp_node); | 228 | id = volume_id_open_node(tmp_node); |
| 229 | unlink(tmp_node); | 229 | unlink(tmp_node); |
