From: Yang Hau Date: Fri, 2 Aug 2024 13:05:35 +0000 (+0800) Subject: Fix the typos X-Git-Tag: v2.42-start~247^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4737c992e3bf762c8c37961cf828641e342831d;p=thirdparty%2Futil-linux.git Fix the typos --- diff --git a/libsmartcols/src/filter.c b/libsmartcols/src/filter.c index ed05ad4b3..80980bc46 100644 --- a/libsmartcols/src/filter.c +++ b/libsmartcols/src/filter.c @@ -417,7 +417,7 @@ int scols_counter_set_name(struct libscols_counter *ct, const char *name) * @name: holder (column) name * * Assigns a counter to the column. The name is used in the same way as names - * in the filter expression. This is usable for counter that calcuate with data + * in the filter expression. This is usable for counter that calculate with data * from table cells (e.g. max, sum, etc.) * * Returns: 0, a negative number in case of an error. diff --git a/libsmartcols/src/grouping.c b/libsmartcols/src/grouping.c index 0f6fe78a4..ed9735fbe 100644 --- a/libsmartcols/src/grouping.c +++ b/libsmartcols/src/grouping.c @@ -11,7 +11,7 @@ * Lines groups manipulation API. The grouping API can be used to create M:N * relations between lines and on tree-like output it prints extra chart to * visualize these relations. The group has unlimited number of members and - * group childs. See libsmartcols/sample/grouping* for more details. + * group children. See libsmartcols/sample/grouping* for more details. */ /* Private API */ diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c index 501961f5f..33ed759f8 100644 --- a/login-utils/sulogin.c +++ b/login-utils/sulogin.c @@ -78,7 +78,7 @@ static struct sigaction saved_sigquit; static struct sigaction saved_sighup; static struct sigaction saved_sigchld; -static volatile sig_atomic_t alarm_rised; +static volatile sig_atomic_t alarm_raised; static volatile sig_atomic_t sigchild; #define SULOGIN_PASSWORD_BUFSIZ 128 @@ -419,7 +419,7 @@ static void tcfinal(struct console *con) static void alrm_handler(int sig __attribute__((unused))) { /* Timeout expired */ - alarm_rised = 1; + alarm_raised = 1; } static void chld_handler(int sig __attribute__((unused))) @@ -781,7 +781,7 @@ static char *getpasswd(struct console *con) if (read(fd, &c, 1) < 1) { if (errno == EINTR || errno == EAGAIN) { - if (alarm_rised) { + if (alarm_raised) { ret = NULL; goto quit; } @@ -1213,7 +1213,7 @@ int main(int argc, char **argv) } fprintf(stderr, _("Login incorrect\n\n")); } - if (alarm_rised) { + if (alarm_raised) { tcfinal(con); warnx(_("Timed out\n\n")); } diff --git a/lsfd-cmd/lsfd.c b/lsfd-cmd/lsfd.c index 017298e09..034cd3ac7 100644 --- a/lsfd-cmd/lsfd.c +++ b/lsfd-cmd/lsfd.c @@ -1822,7 +1822,7 @@ static void mark_select_fds_as_multiplexed(char *buf, return; for (int i = 0; i < 3; i++) { - /* If the remote address for the fd_set is 0x0, no set is tehre. */ + /* If the remote address for the fd_set is 0x0, no set is there. */ remote[i].iov_len = local[i].iov_len = fds[i]? sizeof(local_set[i]): 0; expected_n += (ssize_t)local[i].iov_len; local[i].iov_base = local_set + i; diff --git a/misc-utils/findmnt-verify.c b/misc-utils/findmnt-verify.c index 4fa5d0839..845f31fda 100644 --- a/misc-utils/findmnt-verify.c +++ b/misc-utils/findmnt-verify.c @@ -449,12 +449,12 @@ static int verify_fstype(struct verify_context *vfy) realtype = mnt_get_fstype(src, &ambi, cache); if (!realtype) { - const char *reson = errno ? strerror(errno) : _("reason unknown"); + const char *raeson = errno ? strerror(errno) : _("reason unknown"); if (isauto) - verify_err(vfy, _("cannot detect on-disk filesystem type (%s)"), reson); + verify_err(vfy, _("cannot detect on-disk filesystem type (%s)"), raeson); else - verify_warn(vfy, _("cannot detect on-disk filesystem type (%s)"), reson); + verify_warn(vfy, _("cannot detect on-disk filesystem type (%s)"), raeson); goto done; }