From e0034eddbf39b03a562a21014a291422efd6e25b Mon Sep 17 00:00:00 2001 From: Frank Heimes Date: Wed, 29 May 2024 16:06:37 +0200 Subject: [PATCH] s390-tools: Fix typos in code and man page files Fix typos reported by (Debian) lintian. Closes: https://github.com/ibm-s390-linux/s390-tools/pull/168 Signed-off-by: Frank Heimes Signed-off-by: Steffen Eiden --- cmsfs-fuse/cmsfs-fuse.c | 2 +- ipl_tools/cmd_chreipl.c | 4 ++-- tape390/tape390_crypt.c | 2 +- zdev/man/lszdev.8 | 2 +- ziomon/ziomon_msg_tools.c | 2 +- zkey/ekmfweb/zkey-ekmfweb.c | 2 +- zkey/keystore.c | 2 +- zpcictl/zpcictl.8 | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmsfs-fuse/cmsfs-fuse.c b/cmsfs-fuse/cmsfs-fuse.c index cfc30606..a6e0d4f1 100644 --- a/cmsfs-fuse/cmsfs-fuse.c +++ b/cmsfs-fuse/cmsfs-fuse.c @@ -951,7 +951,7 @@ static void set_record_extension(struct file *f, int *record, off_t addr, if (f->record_scan_state != RSS_DATA_BLOCK_STARTED && f->record_scan_state != RSS_DATA_BLOCK_EXT) - DIE("%s: interal error\n", __func__); + DIE("%s: internal error\n", __func__); BUG(*record >= f->fst->nr_records); diff --git a/ipl_tools/cmd_chreipl.c b/ipl_tools/cmd_chreipl.c index a76aa77e..6668a6e5 100644 --- a/ipl_tools/cmd_chreipl.c +++ b/ipl_tools/cmd_chreipl.c @@ -723,14 +723,14 @@ static void check_exists(const char *path, const char *attr) snprintf(fpath, sizeof(fpath), "/sys/firmware/%s", path); if (access(fpath, F_OK) != 0) - ERR_EXIT("System does not allow to set %s", attr); + ERR_EXIT("System does not allow one to set %s", attr); } static void write_str_optional(char *string, char *file, int exit_on_fail, const char *attr) { if (write_str_errno(string, file) && exit_on_fail) - ERR_EXIT("System does not allow to set %s", attr); + ERR_EXIT("System does not allow one to set %s", attr); } /* diff --git a/tape390/tape390_crypt.c b/tape390/tape390_crypt.c index f47d64cd..03bd4522 100644 --- a/tape390/tape390_crypt.c +++ b/tape390/tape390_crypt.c @@ -283,7 +283,7 @@ static void tape390_crypt_parse_opts(struct tape390_crypt *info, int argc, "%s: No device specified.\n",prog_name); if (optind + 1 < argc) ERRMSG_EXIT(EXIT_MISUSE, - "%s: More than one device speficied.\n",prog_name); + "%s: More than one device specified.\n",prog_name); strcpy(info->devname, argv[optind]); } diff --git a/zdev/man/lszdev.8 b/zdev/man/lszdev.8 index 2e873d1b..59fcd4f8 100644 --- a/zdev/man/lszdev.8 +++ b/zdev/man/lszdev.8 @@ -86,7 +86,7 @@ By default lszdev displays information from both the active and the persistent configuration, and, if available, from the auto-configuration. .PP .SS Output Format -In list format, lszdev uses values with the following meaning for the persistent colums (PERS): +In list format, lszdev uses values with the following meaning for the persistent columns (PERS): .B yes .CL A persistent, non-site specific configuration exists; No site specific configurations available. diff --git a/ziomon/ziomon_msg_tools.c b/ziomon/ziomon_msg_tools.c index e86141f6..80adf808 100644 --- a/ziomon/ziomon_msg_tools.c +++ b/ziomon/ziomon_msg_tools.c @@ -196,7 +196,7 @@ int add_to_agg(struct aggr_data *agg_data, struct message *msg, else if (msg->type == f_hdr->msgid_zfcpdd) aggregate_zfcpdd(agg_data, msg); else { - fprintf(stderr, "%s: Unknow msg id: %d," + fprintf(stderr, "%s: Unknown msg id: %d," " discarding\n", toolname, msg->type); return -1; } diff --git a/zkey/ekmfweb/zkey-ekmfweb.c b/zkey/ekmfweb/zkey-ekmfweb.c index 7154ecce..d474e449 100644 --- a/zkey/ekmfweb/zkey-ekmfweb.c +++ b/zkey/ekmfweb/zkey-ekmfweb.c @@ -908,7 +908,7 @@ static const struct util_opt configure_options[] = { "server's certificate. For self signed EKMF Web server " "certificates, this is the default. Use option " "'--tls-pin-server-cert' to ensure the self signed " - "certificate's authenticity explicitely. CA signed " + "certificate's authenticity explicitly. CA signed " "EKMF Web server certificates are verified by default. " "This option disables the verification.", .command = KMS_COMMAND_CONFIGURE, diff --git a/zkey/keystore.c b/zkey/keystore.c index 3343a410..9589d82d 100644 --- a/zkey/keystore.c +++ b/zkey/keystore.c @@ -1382,7 +1382,7 @@ static int _keystore_lock_repository(struct keystore *keystore) if (fchown(keystore->lock_fd, geteuid(), keystore->owner) != 0) { rc = -errno; - warnx("chown faild on file '%s': %s", lock_file_name, + warnx("chown failed on file '%s': %s", lock_file_name, strerror(-rc)); return rc; } diff --git a/zpcictl/zpcictl.8 b/zpcictl/zpcictl.8 index 4c1453ad..e97dfd0f 100644 --- a/zpcictl/zpcictl.8 +++ b/zpcictl/zpcictl.8 @@ -90,7 +90,7 @@ a software RAID can transparently re-integrate the recovered device. For example, after a failure and recovery, a software RAID can resync a stroage device or a network interface can be re-integrated in a bond. In contrast to a complete shut down, the device driver remains active and informs higher -layers of both the occurence of an error state and the eventual recovery. +layers of both the occurrence of an error state and the eventual recovery. .PP . .OD deconfigure "" "DEVICE"