diff options
author | Denys Vlasenko | 2009-11-13 09:08:27 +0100 |
---|---|---|
committer | Denys Vlasenko | 2009-11-13 09:08:27 +0100 |
commit | 6331cf059ccfdf35f4e5a505cbae885094cc41b0 (patch) | |
tree | ccb4b4f0d96d9636861a75f7fc6c97b8b15bd306 /util-linux | |
parent | f4fee418ae9f5308b4d32bc8d4e618f779f3203f (diff) | |
download | busybox-6331cf059ccfdf35f4e5a505cbae885094cc41b0.zip busybox-6331cf059ccfdf35f4e5a505cbae885094cc41b0.tar.gz |
*: 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 cc9eec2..18ea05f 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c @@ -565,7 +565,7 @@ static void write_superblock(void) xlseek(dev_fd, BLOCK_SIZE, SEEK_SET); if (BLOCK_SIZE != full_write(dev_fd, superblock_buffer, BLOCK_SIZE)) - die("cannot write superblock"); + die("can't write superblock"); } static void write_tables(void) @@ -573,11 +573,11 @@ static void write_tables(void) write_superblock(); if (IMAPS * BLOCK_SIZE != write(dev_fd, inode_map, IMAPS * BLOCK_SIZE)) - die("cannot write inode map"); + die("can't write inode map"); if (ZMAPS * BLOCK_SIZE != write(dev_fd, zone_map, ZMAPS * BLOCK_SIZE)) - die("cannot write zone map"); + die("can't write zone map"); if (INODE_BUFFER_SIZE != write(dev_fd, inode_buffer, INODE_BUFFER_SIZE)) - die("cannot write inodes"); + die("can't write inodes"); } static void get_dirsize(void) @@ -607,7 +607,7 @@ static void read_superblock(void) { xlseek(dev_fd, BLOCK_SIZE, SEEK_SET); if (BLOCK_SIZE != full_read(dev_fd, superblock_buffer, BLOCK_SIZE)) - die("cannot read superblock"); + die("can't read superblock"); /* already initialized to: namelen = 14; dirsize = 16; @@ -643,11 +643,11 @@ static void read_tables(void) inode_count = xmalloc(INODES + 1); zone_count = xmalloc(ZONES); if (IMAPS * BLOCK_SIZE != read(dev_fd, inode_map, IMAPS * BLOCK_SIZE)) - die("cannot read inode map"); + die("can't read inode map"); if (ZMAPS * BLOCK_SIZE != read(dev_fd, zone_map, ZMAPS * BLOCK_SIZE)) - die("cannot read zone map"); + die("can't read zone map"); if (INODE_BUFFER_SIZE != read(dev_fd, inode_buffer, INODE_BUFFER_SIZE)) - die("cannot read inodes"); + die("can't read inodes"); if (NORM_FIRSTZONE != FIRSTZONE) { printf("warning: firstzone!=norm_firstzone\n"); errors_uncorrected = 1; diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c index 5e18c28..8b0b226 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) ret = shmctl(id, IPC_RMID, NULL); if (ret) { - bb_perror_msg("cannot remove id %s", argv[0]); + bb_perror_msg("can't remove id %s", argv[0]); nb_errors++; } } diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index 8819cee..c6c2036 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c @@ -243,22 +243,22 @@ static void write_tables(void) msg_eol = "seek to 0 failed"; xlseek(dev_fd, 0, SEEK_SET); - msg_eol = "cannot clear boot sector"; + msg_eol = "can't clear boot sector"; xwrite(dev_fd, G.boot_block_buffer, 512); msg_eol = "seek to BLOCK_SIZE failed"; xlseek(dev_fd, BLOCK_SIZE, SEEK_SET); - msg_eol = "cannot write superblock"; + msg_eol = "can't write superblock"; xwrite(dev_fd, G.superblock_buffer, BLOCK_SIZE); - msg_eol = "cannot write inode map"; + msg_eol = "can't write inode map"; xwrite(dev_fd, G.inode_map, SB_IMAPS * BLOCK_SIZE); - msg_eol = "cannot write zone map"; + msg_eol = "can't write zone map"; xwrite(dev_fd, G.zone_map, SB_ZMAPS * BLOCK_SIZE); - msg_eol = "cannot write inodes"; + msg_eol = "can't write inodes"; xwrite(dev_fd, G.inode_buffer, INODE_BUFFER_SIZE); msg_eol = "\n"; @@ -687,7 +687,7 @@ int mkfs_minix_main(int argc UNUSED_PARAM, char **argv) xmove_fd(xopen(G.device_name, O_RDWR), dev_fd); if (fstat(dev_fd, &statbuf) < 0) - bb_error_msg_and_die("cannot stat %s", G.device_name); + bb_error_msg_and_die("can't stat %s", G.device_name); if (!S_ISBLK(statbuf.st_mode)) opt &= ~1; // clear -c (check) diff --git a/util-linux/mount.c b/util-linux/mount.c index 1c51373..30037f9 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -1710,7 +1710,7 @@ static int singlemount(struct mntent *mp, int ignore_busy) if (errno == EPERM || errno == EACCES) bb_error_msg(bb_msg_perm_denied_are_you_root); else - bb_perror_msg("cannot setup loop device"); + bb_perror_msg("can't setup loop device"); return errno; } @@ -1915,7 +1915,7 @@ int mount_main(int argc UNUSED_PARAM, char **argv) } fstab = setmntent(fstabname, "r"); if (!fstab) - bb_perror_msg_and_die("cannot read %s", fstabname); + bb_perror_msg_and_die("can't read %s", fstabname); // Loop through entries until we find what we're looking for memset(mtpair, 0, sizeof(mtpair)); diff --git a/util-linux/rdate.c b/util-linux/rdate.c index 0880edf..f257d54 100644 --- a/util-linux/rdate.c +++ b/util-linux/rdate.c @@ -61,7 +61,7 @@ int rdate_main(int argc UNUSED_PARAM, char **argv) bb_error_msg("current time matches remote time"); else if (stime(&remote_time) < 0) - bb_perror_msg_and_die("cannot set time of day"); + bb_perror_msg_and_die("can't set time of day"); } if ((flags & 1) == 0) diff --git a/util-linux/volume_id/volume_id.c b/util-linux/volume_id/volume_id.c index 4826c2e..c8cf946 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) /* create temporary node to open block device */ unlink(tmp_node); if (mknod(tmp_node, (S_IFBLK | 0600), devt) != 0) - bb_perror_msg_and_die("cannot mknod(%s)", tmp_node); + bb_perror_msg_and_die("can't mknod(%s)", tmp_node); id = volume_id_open_node(tmp_node); unlink(tmp_node); |