summaryrefslogtreecommitdiffstats
path: root/disk-utils
diff options
context:
space:
mode:
authorSebastian Rasmussen2016-05-29 23:11:53 +0200
committerSebastian Rasmussen2016-05-31 23:40:21 +0200
commit9e93004171eb0c4c288051b2d7bb37f97a0ae430 (patch)
tree369493906bb3c1c6f2554609c737ada0230f4b2e /disk-utils
parentdocs: Fix various typos (diff)
downloadkernel-qcow2-util-linux-9e93004171eb0c4c288051b2d7bb37f97a0ae430.tar.gz
kernel-qcow2-util-linux-9e93004171eb0c4c288051b2d7bb37f97a0ae430.tar.xz
kernel-qcow2-util-linux-9e93004171eb0c4c288051b2d7bb37f97a0ae430.zip
misc: Fix various typos
Fix various typos in error messages, warnings, debug strings, comments and names of static functions. Signed-off-by: Sebastian Rasmussen <sebras@gmail.com>
Diffstat (limited to 'disk-utils')
-rw-r--r--disk-utils/cfdisk.c2
-rw-r--r--disk-utils/fdisk-menu.c6
-rw-r--r--disk-utils/fdisk.c2
-rw-r--r--disk-utils/fsck.c6
-rw-r--r--disk-utils/fsck.minix.c6
-rw-r--r--disk-utils/mkfs.cramfs.c2
-rw-r--r--disk-utils/mkfs.minix.c6
-rw-r--r--disk-utils/mkswap.c2
-rw-r--r--disk-utils/sfdisk.c10
9 files changed, 21 insertions, 21 deletions
diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index c96d9a523..acea6d8ff 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -529,7 +529,7 @@ static int is_freespace(struct cfdisk *cf, size_t i)
}
/* converts libfdisk FDISK_ASKTYPE_MENU to cfdisk menu and returns user's
- * responseback to libfdisk
+ * response back to libfdisk
*/
static int ask_menu(struct fdisk_ask *ask, struct cfdisk *cf)
{
diff --git a/disk-utils/fdisk-menu.c b/disk-utils/fdisk-menu.c
index ce3422c69..6b61d32b1 100644
--- a/disk-utils/fdisk-menu.c
+++ b/disk-utils/fdisk-menu.c
@@ -681,7 +681,7 @@ static int generic_menu_cb(struct fdisk_context **cxt0,
/*
* This is fdisk frontend for GPT specific libfdisk functions that
- * are not expported by generic libfdisk API.
+ * are not exported by generic libfdisk API.
*/
static int gpt_menu_cb(struct fdisk_context **cxt0,
const struct menu *menu __attribute__((__unused__)),
@@ -777,7 +777,7 @@ static int gpt_menu_cb(struct fdisk_context **cxt0,
/*
* This is fdisk frontend for MBR specific libfdisk functions that
- * are not expported by generic libfdisk API.
+ * are not exported by generic libfdisk API.
*/
static int dos_menu_cb(struct fdisk_context **cxt0,
const struct menu *menu __attribute__((__unused__)),
@@ -942,7 +942,7 @@ static int sgi_menu_cb(struct fdisk_context **cxt0,
/*
* This is fdisk frontend for BSD specific libfdisk functions that
- * are not expported by generic libfdisk API.
+ * are not exported by generic libfdisk API.
*/
static int bsd_menu_cb(struct fdisk_context **cxt0,
const struct menu *menu __attribute__((__unused__)),
diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c
index 1f1f9ba6b..9dbecf989 100644
--- a/disk-utils/fdisk.c
+++ b/disk-utils/fdisk.c
@@ -736,7 +736,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
fputs(_(" -L, --color[=<when>] colorize output (auto, always or never)\n"), out);
fprintf(out,
" %s\n", USAGE_COLORS_DEFAULT);
- fputs(_(" -l, --list display partitions end exit\n"), out);
+ fputs(_(" -l, --list display partitions and exit\n"), out);
fputs(_(" -o, --output <list> output columns\n"), out);
fputs(_(" -t, --type <type> recognize specified partition table type only\n"), out);
fputs(_(" -u, --units[=<unit>] display units: 'cylinders' or 'sectors' (default)\n"), out);
diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index 84d2dcc3d..eede03810 100644
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -89,7 +89,7 @@ static const char *really_wanted[] = {
};
/*
- * Internal structure for mount tabel entries.
+ * Internal structure for mount table entries.
*/
struct fsck_fs_data
{
@@ -490,7 +490,7 @@ static void load_fs_info(void)
errno = 0;
/*
- * Let's follow libmount defauls if $FSTAB_FILE is not specified
+ * Let's follow libmount defaults if $FSTAB_FILE is not specified
*/
path = getenv("FSTAB_FILE");
@@ -1279,7 +1279,7 @@ static int check_all(void)
/*
* This is for the bone-headed user who enters the root
- * filesystem twice. Skip root will skep all root entries.
+ * filesystem twice. Skip root will skip all root entries.
*/
if (skip_root) {
mnt_reset_iter(itr, MNT_ITER_FORWARD);
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index be74f81a0..467f9dfc8 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -6,7 +6,7 @@
*/
/*
- * 09.11.91 - made the first rudimetary functions
+ * 09.11.91 - made the first rudimentary functions
*
* 10.11.91 - updated, does checking, no repairs yet.
* Sent out to the mailing-list for testing.
@@ -22,7 +22,7 @@
*
*
* 19.04.92 - Had to start over again from this old version, as a
- * kernel bug ate my enhanced fsck in february.
+ * kernel bug ate my enhanced fsck in February.
*
* 28.02.93 - added support for different directory entry sizes..
*
@@ -106,7 +106,7 @@
#define ROOT_INO 1
#define YESNO_LENGTH 64
-/* Global variables used in minix_programs.h inline fuctions */
+/* Global variables used in minix_programs.h inline functions */
int fs_version = 1;
char *super_block_buffer;
diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index 0096cd444..65ad356b0 100644
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -20,7 +20,7 @@
/*
* Old version would die on largish filesystems. Change to mmap the
- * files one by one instaed of all simultaneously. - aeb, 2002-11-01
+ * files one by one instead of all simultaneously. - aeb, 2002-11-01
*/
#include <sys/types.h>
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index a4118f175..d4a576f83 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -90,7 +90,7 @@
#define DEFAULT_FS_VERSION 1
/*
- * Global variables used in minix_programs.h inline fuctions
+ * Global variables used in minix_programs.h inline functions
*/
int fs_version = DEFAULT_FS_VERSION;
char *super_block_buffer;
@@ -571,7 +571,7 @@ static void setup_tables(const struct fs_control *ctl) {
/*
* Perform a test of a block; return the number of
- * blocks readable/writeable.
+ * blocks readable/writable.
*/
static size_t do_check(const struct fs_control *ctl, char * buffer, int try, unsigned int current_block) {
ssize_t got;
@@ -767,7 +767,7 @@ int main(int argc, char ** argv)
case '1':
fs_version = 1;
break;
- case 'v': /* kept for backwards compatiblitly */
+ case 'v': /* kept for backwards compatibility */
warnx(_("-v is ambiguous, use '-2' instead"));
/* fallthrough */
case '2':
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index e44d039e1..93a15deac 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -124,7 +124,7 @@ static void set_uuid_and_label(const struct mkswap_control *ctl)
warnx(_("Label was truncated."));
}
- /* report resuls */
+ /* report results */
if (ctl->uuid || ctl->opt_label) {
if (ctl->opt_label)
printf("LABEL=%s, ", ctl->hdr->volume_name);
diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index 2f97bb48a..0f329ed39 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -101,7 +101,7 @@ struct sfdisk {
struct fdisk_partition *orig_pa; /* -N <partno> before the change */
unsigned int verify : 1, /* call fdisk_verify_disklabel() */
- quiet : 1, /* suppres extra messages */
+ quiet : 1, /* suppress extra messages */
interactive : 1, /* running on tty */
noreread : 1, /* don't check device is in use */
force : 1, /* do also stupid things */
@@ -866,7 +866,7 @@ static int command_delete(struct sfdisk *sf, int argc, char **argv)
if (sf->backup)
backup_partition_table(sf, devname);
- /* delate all */
+ /* delete all */
if (argc == 1) {
size_t nparts = fdisk_get_npartitions(sf->cxt);
for (i = 0; i < nparts; i++) {
@@ -907,7 +907,7 @@ static int command_reorder(struct sfdisk *sf, int argc, char **argv)
if (sf->backup)
backup_partition_table(sf, devname);
- if (fdisk_reorder_partitions(sf->cxt) == 1) /* unchnaged */
+ if (fdisk_reorder_partitions(sf->cxt) == 1) /* unchanged */
rc = fdisk_deassign_device(sf->cxt, 1);
else
rc = write_changes(sf);
@@ -1782,7 +1782,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
fputs(_(" -J, --json <dev> dump partition table in JSON format\n"), out);
fputs(_(" -g, --show-geometry [<dev> ...] list geometry of all or specified devices\n"), out);
fputs(_(" -l, --list [<dev> ...] list partitions of each device\n"), out);
- fputs(_(" -F, --list-free [<dev> ...] list unpartitions free areas of each device\n"), out);
+ fputs(_(" -F, --list-free [<dev> ...] list unpartitioned free areas of each device\n"), out);
fputs(_(" -r, --reorder <dev> fix partitions order (by start offset)\n"), out);
fputs(_(" -s, --show-size [<dev> ...] list sizes of all or specified devices\n"), out);
fputs(_(" -T, --list-types print the recognized types (see -X)\n"), out);
@@ -1816,7 +1816,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)
fputs(_(" -o, --output <list> output columns\n"), out);
fputs(_(" -q, --quiet suppress extra info messages\n"), out);
fputs(_(" -w, --wipe <mode> wipe signatures (auto, always or never)\n"), out);
- fputs(_(" -W, --wipe-partitons <mode> wipe signatures from new partitions (auto, always or never)\n"), out);
+ fputs(_(" -W, --wipe-partitions <mode> wipe signatures from new partitions (auto, always or never)\n"), out);
fputs(_(" -X, --label <name> specify label type (dos, gpt, ...)\n"), out);
fputs(_(" -Y, --label-nested <name> specify nested label type (dos, bsd)\n"), out);
fputs(USAGE_SEPARATOR, out);