summaryrefslogtreecommitdiffstats
path: root/misc-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 /misc-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 'misc-utils')
-rw-r--r--misc-utils/blkid.c2
-rw-r--r--misc-utils/cal.c4
-rw-r--r--misc-utils/findmnt.c6
-rw-r--r--misc-utils/kill.c4
-rw-r--r--misc-utils/logger.c4
-rw-r--r--misc-utils/lsblk.c12
-rw-r--r--misc-utils/lslocks.c2
-rw-r--r--misc-utils/test_uuidd.c2
-rw-r--r--misc-utils/uuidd.c2
9 files changed, 19 insertions, 19 deletions
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index 4ecbb5d3d..774634240 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -449,7 +449,7 @@ static int lowprobe_superblocks(blkid_probe pr)
rc = blkid_do_fullprobe(pr);
if (rc < 0)
- return rc; /* -1 = error, 1 = nothing, 0 = succes */
+ return rc; /* -1 = error, 1 = nothing, 0 = success */
if (blkid_probe_lookup_value(pr, "PTTYPE", NULL, NULL) == 0)
return 0; /* partition table detected */
diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index 13d8b44be..8405cd15f 100644
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -41,7 +41,7 @@
*
* 2000-09-01 Michael Charles Pruznick <dummy@netwiz.net>
* Added "-3" option to print prev/next month with current.
- * Added over-ridable default MONTHS_IN_ROW and "-1" option to
+ * Added overridable default MONTHS_IN_ROW and "-1" option to
* get traditional output when -3 is the default. I hope that
* enough people will like -3 as the default that one day the
* product can be shipped that way.
@@ -196,7 +196,7 @@ struct cal_request {
struct cal_control {
const char *full_month[MONTHS_IN_YEAR]; /* month names */
int colormode; /* day and week number highlight */
- int num_months; /* number of requested mounths */
+ int num_months; /* number of requested monts */
int span_months; /* span the date */
int months_in_row; /* number of months horizontally in print out */
int weekstart; /* day the week starts, often Sun or Mon */
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 904a09d2d..b2ff04e8f 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -987,7 +987,7 @@ static struct libmnt_fs *get_next_fs(struct libmnt_table *tb,
} else if (is_mount_compatible_mode()) {
/*
- * Look up for FS in the same way how mount(8) searchs in fstab
+ * Look up for FS in the same way how mount(8) searches in fstab
*
* findmnt -f <spec>
*/
@@ -1175,7 +1175,7 @@ static int poll_table(struct libmnt_table *tb, const char *tabfile,
tb = tb_new;
tb_new = tmp;
- /* remove allredy printed lines to reduce memory usage */
+ /* remove already printed lines to reduce memory usage */
scols_table_remove_lines(table);
mnt_reset_table(tb_new);
@@ -1622,7 +1622,7 @@ int main(int argc, char *argv[])
/* whole tree */
rc = create_treenode(table, tb, NULL, NULL);
} else {
- /* whole lits of sub-tree */
+ /* whole list of sub-tree */
rc = add_matching_lines(tb, table, direction);
if (rc != 0
diff --git a/misc-utils/kill.c b/misc-utils/kill.c
index 92b2ae9cb..34b948797 100644
--- a/misc-utils/kill.c
+++ b/misc-utils/kill.c
@@ -38,7 +38,7 @@
* 1999-02-22 Arkadiusz Miƛkiewicz <misiek@pld.ORG.PL>
* - added Native Language Support
*
- * 1999-11-13 aeb Accept signal numers 128+s.
+ * 1999-11-13 aeb Accept signal numbers 128+s.
*
* Copyright (C) 2014 Sami Kerola <kerolasa@iki.fi>
* Copyright (C) 2014 Karel Zak <kzak@redhat.com>
@@ -272,7 +272,7 @@ static int signame_to_signum(char *sig)
if (!strncasecmp(sig, "rt", 2))
return rtsig_to_signum(sig + 2);
#endif
- /* Normal sugnals */
+ /* Normal signals */
for (n = 0; n < ARRAY_SIZE(sys_signame); n++) {
if (!strcasecmp(sys_signame[n].name, sig))
return sys_signame[n].val;
diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index b7b08eb84..b01538b65 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -130,7 +130,7 @@ struct logger_ctl {
unsigned int
unix_socket_errors:1, /* whether to report or not errors */
noact:1, /* do not write to sockets */
- prio_prefix:1, /* read priority from intput */
+ prio_prefix:1, /* read priority from input */
stderr_printout:1, /* output message to stderr */
rfc5424_time:1, /* include time stamp */
rfc5424_tq:1, /* include time quality markup */
@@ -768,7 +768,7 @@ static void syslog_rfc5424_header(struct logger_ctl *const ctl)
sd = get_reserved_structured_data(ctl);
- /* time quality structured data (maybe overwriten by --sd-id timeQuality) */
+ /* time quality structured data (maybe overwritten by --sd-id timeQuality) */
if (ctl->rfc5424_tq && !has_structured_data_id(sd, "timeQuality")) {
add_structured_data_id(sd, "timeQuality");
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 5b239f183..752783af1 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -269,9 +269,9 @@ struct blkdev_cxt {
char *fstype; /* detected fs, NULL or "?" if cannot detect */
char *uuid; /* filesystem UUID (or stack uuid) */
char *label; /* filesystem label */
- char *parttype; /* partiton type UUID */
+ char *parttype; /* partition type UUID */
char *partuuid; /* partition UUID */
- char *partlabel; /* partiton label */
+ char *partlabel; /* partition label */
char *partflags; /* partition flags */
char *wwn; /* storage WWN */
char *serial; /* disk serial number */
@@ -298,7 +298,7 @@ static int is_maj_excluded(int maj)
assert(ARRAY_SIZE(excludes) > nexcludes);
if (!nexcludes)
- return 0; /* filter not enabled, device not exluded */
+ return 0; /* filter not enabled, device not excluded */
for (i = 0; i < nexcludes; i++) {
if (excludes[i] == maj) {
@@ -471,7 +471,7 @@ static char *get_device_mountpoint(struct blkdev_cxt *cxt)
mnt_table_parse_mtab(mtab, NULL);
}
- /* Note that maj:min in /proc/self/mouninfo does not have to match with
+ /* Note that maj:min in /proc/self/mountinfo does not have to match with
* devno as returned by stat(), so we have to try devname too
*/
fs = mnt_table_find_devno(mtab, makedev(cxt->maj, cxt->min), MNT_ITER_BACKWARD);
@@ -1390,7 +1390,7 @@ static int list_deps(struct blkdev_cxt *cxt)
DBG(CXT, ul_debugobj(cxt, "%s: %s: dependence is whole-disk",
cxt->name, d->d_name));
/* For inverse tree we don't want to show partitions
- * if the dependence is pn whle-disk */
+ * if the dependence is on whole-disk */
process_blkdev(&dep, cxt, lsblk->inverse ? 0 : 1, NULL);
}
reset_blkdev_cxt(&dep);
@@ -1405,7 +1405,7 @@ static int process_blkdev(struct blkdev_cxt *cxt, struct blkdev_cxt *parent,
int do_partitions, const char *part_name)
{
if (do_partitions && cxt->npartitions)
- list_partitions(cxt, parent, part_name); /* partitoins + whole-disk */
+ list_partitions(cxt, parent, part_name); /* partitions + whole-disk */
else
fill_table_line(cxt, parent ? parent->scols_line : NULL); /* whole-disk only */
diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c
index a47c1d0ad..1f33dfde9 100644
--- a/misc-utils/lslocks.c
+++ b/misc-utils/lslocks.c
@@ -4,7 +4,7 @@
* Copyright (C) 2012 Davidlohr Bueso <dave@gnu.org>
*
* Very generally based on lslk(8) by Victor A. Abell <abe@purdue.edu>
- * Since it stopped being maingained over a decade ago, this
+ * Since it stopped being maintained over a decade ago, this
* program should be considered its replacement.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/misc-utils/test_uuidd.c b/misc-utils/test_uuidd.c
index 36f3b3db2..4a2daf936 100644
--- a/misc-utils/test_uuidd.c
+++ b/misc-utils/test_uuidd.c
@@ -188,7 +188,7 @@ static void create_nthreads(process_t *proc, size_t index)
}
if (ncreated != nthreads)
- fprintf(stderr, "%d: %zu threads not craeted and ~%zu objects will be ignored\n",
+ fprintf(stderr, "%d: %zu threads not created and ~%zu objects will be ignored\n",
proc->pid, nthreads - ncreated,
(nthreads - ncreated) * nobjects);
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index feb0a0a66..4b1782ae1 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -421,7 +421,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
warn(_("poll failed"));
all_done(uuidd_cxt, EXIT_FAILURE);
}
- if (ret == 0) { /* truen when poll() times out */
+ if (ret == 0) { /* true when poll() times out */
if (uuidd_cxt->debug)
fprintf(stderr, _("timeout [%d sec]\n"), uuidd_cxt->timeout),
all_done(uuidd_cxt, EXIT_SUCCESS);