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>

13 files changed, 20 insertions, 20 deletions

diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index b351595fc..36c966f6a 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -119,7 +119,7 @@ static const struct dmesg_name level_names[] =
 
 /*
  * sys/syslog.h uses (f << 3) for all facility codes.
- * We want to use the codes as array idexes, so shift back...
+ * We want to use the codes as array indexes, so shift back...
  *
  * Note that libc LOG_FAC() macro returns the base codes, not the
  * shifted code :-)
@@ -244,7 +244,7 @@ static int set_level_color(int log_level, const char *mesg, size_t mesgsz)
 		break;
 	}
 
-	/* well, sometimes the messges contains important keywords, but in
+	/* well, sometimes the messages contains important keywords, but in
 	 * non-warning/error messages
 	 */
 	if (id < 0 && memmem(mesg, mesgsz, "segfault at", 11))
@@ -320,7 +320,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
  *  <name>   ::= case-insensitive text
  *
  *  Note that @len argument is not set when parsing "-n <level>" command line
- *  option. The console_level is intepreted as "log level less than the value".
+ *  option. The console_level is interpreted as "log level less than the value".
  *
  *  For example "dmesg -n 8" or "dmesg -n debug" enables debug console log
  *  level by klogctl(SYSLOG_ACTION_CONSOLE_LEVEL, NULL, 8). The @str argument
@@ -1066,7 +1066,7 @@ static int init_kmsg(struct dmesg_control *ctl)
 /*
  * /dev/kmsg record format:
  *
- *     faclev,seqnum,timestamp[optional, ...];messgage\n
+ *     faclev,seqnum,timestamp[optional, ...];message\n
  *      TAGNAME=value
  *      ...
  *
@@ -1130,7 +1130,7 @@ mesg:
 	rec->mesg_size = p - rec->mesg;
 
 	/*
-	 * Kernel escapes non-printable characters, unfortuately kernel
+	 * Kernel escapes non-printable characters, unfortunately kernel
 	 * definition of "non-printable" is too strict. On UTF8 console we can
 	 * print many chars, so let's decode from kernel.
 	 */
diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c
index 6bbf1c99f..b764b0b33 100644
--- a/sys-utils/fstrim.c
+++ b/sys-utils/fstrim.c
@@ -121,7 +121,7 @@ static int has_discard(const char *devname, struct sysfs_cxt *wholedisk)
 		return 1;
 	/*
 	 * This is tricky to read the info from sys/, because the queue
-	 * atrributes are provided for whole devices (disk) only. We're trying
+	 * attributes are provided for whole devices (disk) only. We're trying
 	 * to reuse the whole-disk sysfs context to optimize this stuff (as
 	 * system usually have just one disk only).
 	 */
@@ -220,7 +220,7 @@ static int fstrim_all(struct fstrim_range *rangetpl, int verbose)
 			continue;
 
 		/* Is it really accessible mountpoint? Not all mountpoints are
-		 * accessible (maybe over mounted by another fylesystem) */
+		 * accessible (maybe over mounted by another filesystem) */
 		path = mnt_get_mountpoint(tgt);
 		if (path && strcmp(path, tgt) == 0)
 			rc = 0;
diff --git a/sys-utils/hwclock-cmos.c b/sys-utils/hwclock-cmos.c
index 7f564e70e..9103b7343 100644
--- a/sys-utils/hwclock-cmos.c
+++ b/sys-utils/hwclock-cmos.c
@@ -342,7 +342,7 @@ static inline unsigned long cmos_read(unsigned long reg)
 		 *  outb (0x0d, 0x70);  // 0x0d: random read-only location
 		 *
 		 * Other docs state that "any write to 0x70 should be
-		 * followed by an action to 0x71 or the RTC wil be left in
+		 * followed by an action to 0x71 or the RTC will be left in
 		 * an unknown state". Most docs say that it doesn't matter at
 		 * all what one does.
 		 */
diff --git a/sys-utils/ipcutils.c b/sys-utils/ipcutils.c
index 3c0fba3e0..51fce7b44 100644
--- a/sys-utils/ipcutils.c
+++ b/sys-utils/ipcutils.c
@@ -136,7 +136,7 @@ int ipc_shm_get_info(int id, struct shm_data **shmds)
 			   &p->shm_ctim,
 			   &p->shm_rss,
 			   &p->shm_swp) < 14)
-			continue; /* ivalid line, skipped */
+			continue; /* invalid line, skipped */
 
 		if (id > -1) {
 			/* ID specified */
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 0df8af92b..267e728e1 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -250,7 +250,7 @@ struct lscpu_desc {
 	int		nsockets;	/* number of all online sockets */
 	cpu_set_t	**socketmaps;	/* unique core_siblings */
 
-	/* cores -- based on thread_siblings (internel kernel map of cpuX's
+	/* cores -- based on thread_siblings (internal kernel map of cpuX's
 	 * hardware threads within the same core as cpuX) */
 	int		ncores;		/* number of all online cores */
 	cpu_set_t	**coremaps;	/* unique thread_siblings */
diff --git a/sys-utils/mountpoint.c b/sys-utils/mountpoint.c
index ad9c1da2e..070d02478 100644
--- a/sys-utils/mountpoint.c
+++ b/sys-utils/mountpoint.c
@@ -1,7 +1,7 @@
 /*
  * mountpoint(1) - see if a directory is a mountpoint
  *
- * This is libmount based reimplementation of the mountpoit(1)
+ * This is libmount based reimplementation of the mountpoint(1)
  * from sysvinit project.
  *
  *
diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c
index 8dbd22b2e..f85ace9fc 100644
--- a/sys-utils/nsenter.c
+++ b/sys-utils/nsenter.c
@@ -359,7 +359,7 @@ int main(int argc, char *argv[])
 	 * them.  Do this in two passes, not entering the user
 	 * namespace on the first pass.  So if we're deprivileging the
 	 * container we'll enter the user namespace last and if we're
-	 * privileging it then we enter the usernamespace first
+	 * privileging it then we enter the user namespace first
 	 * (because the initial setns will fail).
 	 */
 	for (pass = 0; pass < 2; pass ++) {
diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
index 7c748dcc5..72894eab8 100644
--- a/sys-utils/rtcwake.c
+++ b/sys-utils/rtcwake.c
@@ -474,7 +474,7 @@ int main(int argc, char **argv)
 			seconds = strtou32_or_err(optarg, _("invalid seconds argument"));
 			break;
 		case 't':
-			/* alarm time, time_t (absolute, seconds since epoc) */
+			/* alarm time, time_t (absolute, seconds since epoch) */
 			alarm = strtou32_or_err(optarg, _("invalid time argument"));
 			break;
 		case OPT_DATE:
diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c
index cf29cf770..da29e2c01 100644
--- a/sys-utils/setarch.c
+++ b/sys-utils/setarch.c
@@ -274,7 +274,7 @@ int main(int argc, char *argv[])
 		OPT_LIST
 	};
 
-	/* Options --3gb and --4gb are for compatibitity with an old
+	/* Options --3gb and --4gb are for compatibility with an old
 	 * Debian setarch implementation.  */
 	static const struct option longopts[] = {
 		{"help",		no_argument,	NULL,	'h'},
diff --git a/sys-utils/swapoff.c b/sys-utils/swapoff.c
index 168d10f3f..562b24f33 100644
--- a/sys-utils/swapoff.c
+++ b/sys-utils/swapoff.c
@@ -27,7 +27,7 @@ static int all;
 #define CANONIC	1
 
 /*
- * This function works like mnt_resolve_tag(), but it's able to read UUiD/LABEL
+ * This function works like mnt_resolve_tag(), but it's able to read UUID/LABEL
  * from regular swap files too (according to entries in /proc/swaps). Note that
  * mnt_resolve_tag() and mnt_resolve_spec() works with system visible block
  * devices only.
diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c
index 97acf1ea9..62a776d40 100644
--- a/sys-utils/swapon.c
+++ b/sys-utils/swapon.c
@@ -767,7 +767,7 @@ static int swapon_all(struct swapon_ctl *ctl)
 
 		if (prop.no_fail && access(device, R_OK) != 0) {
 			if (ctl->verbose)
-				warnx(_("%s: unaccessible -- ignored"), device);
+				warnx(_("%s: inaccessible -- ignored"), device);
 			continue;
 		}
 
diff --git a/sys-utils/umount.c b/sys-utils/umount.c
index 8e3ef4e52..0c81970c7 100644
--- a/sys-utils/umount.c
+++ b/sys-utils/umount.c
@@ -344,7 +344,7 @@ static int umount_one_if_mounted(struct libmnt_context *cxt, const char *spec)
 
 	rc = mnt_context_find_umount_fs(cxt, spec, &fs);
 	if (rc == 1) {
-		rc = MOUNT_EX_SUCCESS;		/* alredy unmounted */
+		rc = MOUNT_EX_SUCCESS;		/* already unmounted */
 		mnt_reset_context(cxt);
 	} else if (rc < 0) {
 		rc = mk_exit_code(cxt, rc);	/* error */
@@ -365,7 +365,7 @@ static int umount_do_recurse(struct libmnt_context *cxt,
 	if (!itr)
 		err(MOUNT_EX_SYSERR, _("libmount iterator allocation failed"));
 
-	/* umount all childern */
+	/* umount all children */
 	for (;;) {
 		rc = mnt_table_next_child_fs(tb, itr, fs, &child);
 		if (rc < 0) {
@@ -452,7 +452,7 @@ static int umount_alltargets(struct libmnt_context *cxt, const char *spec, int r
 		goto done;
 	}
 
-	/* Note that @fs is from mount context and the context will be reseted
+	/* Note that @fs is from mount context and the context will be reset
 	 * after each umount() call */
 	devno = mnt_fs_get_devno(fs);
 	fs = NULL;
diff --git a/sys-utils/zramctl.c b/sys-utils/zramctl.c
index 171380556..853401caf 100644
--- a/sys-utils/zramctl.c
+++ b/sys-utils/zramctl.c
@@ -216,7 +216,7 @@ static struct sysfs_cxt *zram_get_sysfs(struct zram *z)
 		if (sysfs_init(&z->sysfs, devno, NULL))
 			return NULL;
 		if (*z->devname != '/') {
-			/* cannonicalize the device name according to /sys */
+			/* canonicalize the device name according to /sys */
 			char name[PATH_MAX];
 			if (sysfs_get_devname(&z->sysfs, name, sizeof(name)))
 				snprintf(z->devname, sizeof(z->devname), "/dev/%s", name);