From: Yuri Chornoivan Date: Thu, 9 Jul 2020 17:14:32 +0000 (+0300) Subject: Fix minor typos X-Git-Tag: v2.36~58 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=311e33afef791761a99850bc7c24763f322a4f28;p=thirdparty%2Futil-linux.git Fix minor typos --- diff --git a/lib/loopdev.c b/lib/loopdev.c index 70cc0c23a6..ef22a9d870 100644 --- a/lib/loopdev.c +++ b/lib/loopdev.c @@ -681,7 +681,7 @@ struct loop_info64 *loopcxt_get_info(struct loopdev_cxt *lc) /* * @lc: context * - * Returns (allocated) string with path to the file assicieted + * Returns (allocated) string with path to the file associated * with the current loop device. */ char *loopcxt_get_backing_file(struct loopdev_cxt *lc) diff --git a/lib/randutils.c b/lib/randutils.c index ce476f8a73..bd2a8f6bf3 100644 --- a/lib/randutils.c +++ b/lib/randutils.c @@ -123,7 +123,7 @@ void random_get_bytes(void *buf, size_t nbytes) break; } else if (errno == EAGAIN && lose_counter < UL_RAND_READ_ATTEMPTS) { - xusleep(UL_RAND_READ_DELAY); /* no etropy, wait and try again */ + xusleep(UL_RAND_READ_DELAY); /* no entropy, wait and try again */ lose_counter++; } else break; diff --git a/libblkid/src/blkidP.h b/libblkid/src/blkidP.h index 699413eb26..802a1b3a6d 100644 --- a/libblkid/src/blkidP.h +++ b/libblkid/src/blkidP.h @@ -220,7 +220,7 @@ struct blkid_struct_probe #define BLKID_FL_TINY_DEV (1 << 2) /* <= 1.47MiB (floppy or so) */ #define BLKID_FL_CDROM_DEV (1 << 3) /* is a CD/DVD drive */ #define BLKID_FL_NOSCAN_DEV (1 << 4) /* do not scan this device */ -#define BLKID_FL_MODIF_BUFF (1 << 5) /* cached bufferes has been modified */ +#define BLKID_FL_MODIF_BUFF (1 << 5) /* cached buffers has been modified */ /* private per-probing flags */ #define BLKID_PROBE_FL_IGNORE_PT (1 << 1) /* ignore partition table */ diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c index 1992677cc2..9f116f15c8 100644 --- a/libblkid/src/probe.c +++ b/libblkid/src/probe.c @@ -693,9 +693,9 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr, uint64_t off, uint64_t len * blkid_probe_reset_buffers: * @pr: prober * - * libblkid reuse all already read buffers from the device. The bufferes may be + * libblkid reuse all already read buffers from the device. The buffers may be * modified by blkid_probe_hide_range(). This function reset and free all - * cached bufferes. The next blkid_do_probe() will read all data from the + * cached buffers. The next blkid_do_probe() will read all data from the * device. * * Returns: <0 in case of failure, or 0 on success. @@ -1267,7 +1267,7 @@ int blkid_do_wipe(blkid_probe pr, int dryrun) * according to the current libblkid probing result. * * Note that blkid_probe_hide_range() changes semantic of this function and - * cached bufferes are not reset, but library uses in-memory modified + * cached buffers are not reset, but library uses in-memory modified * buffers to call the next probing function. * * diff --git a/libblkid/src/superblocks/udf.c b/libblkid/src/superblocks/udf.c index f2865b2d02..2a36ceadef 100644 --- a/libblkid/src/superblocks/udf.c +++ b/libblkid/src/superblocks/udf.c @@ -243,7 +243,7 @@ static int probe_udf(blkid_probe pr, * terminated by the first sector which is not a valid * descriptor. * UDF-2.60 2.1.7: UDF 2.00 and lower revisions do not - * have requirement that NSR descritor is in Extended Area + * have requirement that NSR descriptor is in Extended Area * (between BEA01 and TEA01) and that there is only one * Extended Area. So do not stop scanning after TEA01. */ break; diff --git a/libfdisk/src/context.c b/libfdisk/src/context.c index 69038afcae..8eb12271cd 100644 --- a/libfdisk/src/context.c +++ b/libfdisk/src/context.c @@ -868,7 +868,7 @@ static inline int add_to_partitions_array( * partition table. The BLKPG_* ioctls are used for individual partitions. The * advantage is that unmodified partitions maybe mounted. * - * The function behavies like fdisk_reread_partition_table() on systems where + * The function behaves like fdisk_reread_partition_table() on systems where * are no available BLKPG_* ioctls. * * Returns: <0 on error, or 0. diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c index 99a178fa56..370bd4097e 100644 --- a/libfdisk/src/gpt.c +++ b/libfdisk/src/gpt.c @@ -385,7 +385,7 @@ static inline int gpt_calculate_sizeof_entries( sizeof(struct gpt_entry); if (nents == 0 || esz == 0 || SIZE_MAX/esz < nents) { - DBG(GPT, ul_debug("entreis array size check failed")); + DBG(GPT, ul_debug("entries array size check failed")); return -ERANGE; } diff --git a/libfdisk/src/partition.c b/libfdisk/src/partition.c index f737ff9be6..ae07882e6a 100644 --- a/libfdisk/src/partition.c +++ b/libfdisk/src/partition.c @@ -1419,7 +1419,7 @@ int fdisk_partition_has_wipe(struct fdisk_context *cxt, struct fdisk_partition * * If @pa is not specified or any @pa item is missing the libfdisk will ask by * fdisk_ask_ API. * - * The @pa template is is important for non-interactive partitioning, + * The @pa template is important for non-interactive partitioning, * especially for MBR where is necessary to differentiate between * primary/logical; this is done by start offset or/and partno. * The rules for MBR: diff --git a/libmount/src/context.c b/libmount/src/context.c index 8b548b20ff..f9e745225a 100644 --- a/libmount/src/context.c +++ b/libmount/src/context.c @@ -1094,7 +1094,7 @@ const char *mnt_context_get_fstype(struct libmnt_context *cxt) * @cxt: mount context * @optstr: comma delimited mount options * - * Note that that MS_MOVE cannot be specified as "string". It's operation that + * Note that MS_MOVE cannot be specified as "string". It's operation that * is no supported in fstab (etc.) * * Returns: 0 on success, negative number in case of error. diff --git a/libmount/src/tab.c b/libmount/src/tab.c index cac7fd3c12..e91254a712 100644 --- a/libmount/src/tab.c +++ b/libmount/src/tab.c @@ -488,7 +488,7 @@ static int __table_insert_fs( * @pos is NULL than add the begin of the @tab if @before is 1; or to the tail * of the @tb if @before is 0. * - * This function inncrements reference to @fs. Don't forget to use + * This function increments reference to @fs. Don't forget to use * mnt_unref_fs() after mnt_table_insert_fs() if you want to keep the @fs * referenced by the table only. * diff --git a/libsmartcols/src/grouping.c b/libsmartcols/src/grouping.c index fdc1a111e7..d0544efd8a 100644 --- a/libsmartcols/src/grouping.c +++ b/libsmartcols/src/grouping.c @@ -222,7 +222,7 @@ static int group_state_for_line(struct libscols_group *gr, struct libscols_line } /* - * apply new @state to the chunk (addresesd by @xx) of grpset used for the group (@gr) + * apply new @state to the chunk (addressed by @xx) of grpset used for the group (@gr) */ static void grpset_apply_group_state(struct libscols_group **xx, int state, struct libscols_group *gr) { diff --git a/libsmartcols/src/smartcolsP.h b/libsmartcols/src/smartcolsP.h index e745a05a48..e36bb5171b 100644 --- a/libsmartcols/src/smartcolsP.h +++ b/libsmartcols/src/smartcolsP.h @@ -236,7 +236,7 @@ struct libscols_table { colors_wanted :1, /* enable colors */ is_term :1, /* isatty() */ padding_debug :1, /* output visible padding chars */ - is_dummy_print :1, /* printing used for width calcualion only */ + is_dummy_print :1, /* printing used for width calculation only */ maxout :1, /* maximize output */ minout :1, /* minimize output (mutually exclusive to maxout) */ header_repeat :1, /* print header after libscols_table->termheight */ diff --git a/login-utils/runuser.1 b/login-utils/runuser.1 index 8d38dd7de2..525e8e7053 100644 --- a/login-utils/runuser.1 +++ b/login-utils/runuser.1 @@ -10,7 +10,7 @@ runuser \- run a command with substitute user and group ID .RI [ user " [" argument "...]]" .SH DESCRIPTION .B runuser -can be used to to run commands with a substitute user and group ID. +can be used to run commands with a substitute user and group ID. If the option \fB\-u\fR is not given, it falls back to .BR su -compatible semantics and a shell is executed. diff --git a/login-utils/sulogin-consoles.c b/login-utils/sulogin-consoles.c index 2c0eed3a4c..facb1ffbbd 100644 --- a/login-utils/sulogin-consoles.c +++ b/login-utils/sulogin-consoles.c @@ -318,7 +318,7 @@ int append_console(struct list_head *consoles, const char * const name) struct console *restrict tail; const struct console *last = NULL; - DBG(dbgprint("appenging %s", name)); + DBG(dbgprint("appending %s", name)); if (!list_empty(consoles)) last = list_last_entry(consoles, struct console, entry); diff --git a/sys-utils/blkzone.c b/sys-utils/blkzone.c index 2e00a2823a..ed5e68df74 100644 --- a/sys-utils/blkzone.c +++ b/sys-utils/blkzone.c @@ -342,7 +342,7 @@ static int blkzone_action(struct blkzone_control *ctl) err(EXIT_FAILURE, _("%s: %s ioctl failed"), ctl->devname, ctl->command->ioctl_name); else if (ctl->verbose) - printf(_("%s: successfull %s of zones in range from %" PRIu64 ", to %" PRIu64), + printf(_("%s: successful %s of zones in range from %" PRIu64 ", to %" PRIu64), ctl->devname, ctl->command->name, ctl->offset, diff --git a/sys-utils/irq-common.c b/sys-utils/irq-common.c index 2992d3c7da..81e8b1d2ee 100644 --- a/sys-utils/irq-common.c +++ b/sys-utils/irq-common.c @@ -345,7 +345,7 @@ void set_sort_func_by_name(struct irq_output *out, const char *name) else if (strcasecmp(name, "NAME") == 0) out->sort_cmp_func = cmp_name; else - errx(EXIT_FAILURE, _("unssupported column name to sort output")); + errx(EXIT_FAILURE, _("unsupported column name to sort output")); } void set_sort_func_by_key(struct irq_output *out, char c) diff --git a/sys-utils/lscpu.h b/sys-utils/lscpu.h index 5bbdb348e0..13af2ad0ac 100644 --- a/sys-utils/lscpu.h +++ b/sys-utils/lscpu.h @@ -119,7 +119,7 @@ struct lscpu_desc { char *mtid; /* maximum thread id (s390) */ char *addrsz; /* address sizes */ int dispatching; /* none, horizontal or vertical */ - int freqboost; /* -1 if not evailable */ + int freqboost; /* -1 if not available */ int mode; /* rm, lm or/and tm */ int ncpuspos; /* maximal possible CPUs */ diff --git a/term-utils/agetty.c b/term-utils/agetty.c index 8854798f6d..191fa29c08 100644 --- a/term-utils/agetty.c +++ b/term-utils/agetty.c @@ -1285,7 +1285,7 @@ static void termio_init(struct options *op, struct termios *tp) ospeed = cfgetospeed(tp); /* Save also the original speed to array of the speeds to make - * it possible to return the the original after unexpected BREAKs. + * it possible to return the original after unexpected BREAKs. */ if (op->numspeed) op->speeds[op->numspeed++] = ispeed ? ispeed : diff --git a/term-utils/script-playutils.c b/term-utils/script-playutils.c index 517c42d6b7..c589438193 100644 --- a/term-utils/script-playutils.c +++ b/term-utils/script-playutils.c @@ -47,7 +47,7 @@ struct replay_step { char type; /* 'I'nput, 'O'utput, ... */ size_t size; - char *name; /* signals / heders */ + char *name; /* signals / headers */ char *value; struct timeval delay; @@ -216,7 +216,7 @@ int replay_set_timing_file(struct replay_setup *stp, const char *filename) rc = -ENOMEM; else { log->noseek = 1; - DBG(LOG, ul_debug("accociate file '%s' for streams 'SH'", filename)); + DBG(LOG, ul_debug("associate file '%s' for streams 'SH'", filename)); } } @@ -253,7 +253,7 @@ int replay_associate_log(struct replay_setup *stp, if (rc == 0) replay_new_log(stp, streams, filename, f); - DBG(LOG, ul_debug("accociate log file '%s', streams '%s' [rc=%d]", filename, streams, rc)); + DBG(LOG, ul_debug("associate log file '%s', streams '%s' [rc=%d]", filename, streams, rc)); return rc; }