From d90d4b1b888b91b5fc00bfee3b0b1ecd7121bfb8 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Fri, 12 Apr 2013 13:00:05 -0700 Subject: [PATCH] Fix typos in log messages Someone has to do it, right?.. Signed-off-by: Kir Kolyshkin Signed-off-by: Pavel Emelyanov --- cr-dump.c | 10 +++++----- cr-exec.c | 2 +- cr-restore.c | 4 ++-- crtools.c | 4 ++-- file-lock.c | 10 +++++----- files.c | 2 +- fsnotify.c | 2 +- mount.c | 2 +- net.c | 2 +- page-read.c | 4 ++-- ptrace.c | 6 +++--- sk-inet.c | 2 +- sk-tcp.c | 4 ++-- sockets.c | 4 ++-- tty.c | 2 +- util.c | 2 +- 16 files changed, 31 insertions(+), 31 deletions(-) diff --git a/cr-dump.c b/cr-dump.c index d5eb07209..31cc1122f 100644 --- a/cr-dump.c +++ b/cr-dump.c @@ -430,7 +430,7 @@ static int get_task_auxv(pid_t pid, MmEntry *mm, size_t *size) { int fd, ret, i; - pr_info("Obtainting task auvx ... "); + pr_info("Obtaining task auvx ... "); fd = open_proc(pid, "auxv"); if (fd < 0) @@ -443,7 +443,7 @@ static int get_task_auxv(pid_t pid, MmEntry *mm, size_t *size) break; else if (ret != sizeof(auxv_t)) { ret = -1; - pr_perror("Error readind %d's auxv[%d]", + pr_perror("Error reading %d's auxv[%d]", pid, i); goto err; } @@ -518,7 +518,7 @@ static int get_task_personality(pid_t pid, u32 *personality) FILE *file = NULL; int ret = -1; - pr_info("Obtainting personality ... "); + pr_info("Obtaining personality ... "); file = fopen_proc(pid, "personality"); if (!file) @@ -1338,7 +1338,7 @@ static int dump_zombies(void) goto err; } - pr_info("Obtainting zombie stat ... "); + pr_info("Obtaining zombie stat ... "); if (parse_pid_stat(item->pid.virt, &pps_buf) < 0) goto err; @@ -1384,7 +1384,7 @@ static int dump_one_task(struct pstree_item *item) if (!dfds) goto err_free; - pr_info("Obtainting task stat ... "); + pr_info("Obtaining task stat ... "); ret = parse_pid_stat(pid, &pps_buf); if (ret < 0) goto err; diff --git a/cr-exec.c b/cr-exec.c index 79c7461b5..1b73da049 100644 --- a/cr-exec.c +++ b/cr-exec.c @@ -118,7 +118,7 @@ int cr_exec(int pid, char **opt) ret = execute_syscall(ctl, si, opt + 1); if (ret < 0) - pr_err("Can't execure syscall remotely\n"); + pr_err("Can't execute syscall remotely\n"); parasite_cure_seized(ctl, NULL); out_unseize: diff --git a/cr-restore.c b/cr-restore.c index 48dbff312..53690b0b1 100644 --- a/cr-restore.c +++ b/cr-restore.c @@ -566,7 +566,7 @@ static int prepare_sigactions(int pid) ret = -1; break; } - pr_warn("This format of sigacts-%d.img is depricated\n", pid); + pr_warn("This format of sigacts-%d.img is deprecated\n", pid); break; } if (ret < 0) @@ -1272,7 +1272,7 @@ out: return 1; } - pr_info("Restore finised successfully. Resuming tasks.\n"); + pr_info("Restore finished successfully. Resuming tasks.\n"); futex_set_and_wake(&task_entries->start, CR_STATE_COMPLETE); if (!opts->restore_detach) diff --git a/crtools.c b/crtools.c index cf8ea623c..606b9b03c 100644 --- a/crtools.c +++ b/crtools.c @@ -218,7 +218,7 @@ int main(int argc, char *argv[]) n->outside = strchr(optarg, '='); if (n->outside == NULL) { xfree(n); - pr_err("Invalid agument for --veth-pair\n"); + pr_err("Invalid argument for --veth-pair\n"); goto usage; } @@ -289,7 +289,7 @@ int main(int argc, char *argv[]) ret = open_image_dir(); if (ret < 0) { - pr_perror("can't open currect directory"); + pr_perror("can't open current directory"); return -1; } diff --git a/file-lock.c b/file-lock.c index af2d885be..d89fcd827 100644 --- a/file-lock.c +++ b/file-lock.c @@ -53,7 +53,7 @@ static int fill_flock_entry(FileLockEntry *fle, const char *fl_flag, } else if (!strcmp(fl_flag, "FLOCK")) { fle->flag |= FL_FLOCK; } else { - pr_err("Unknow file lock!\n"); + pr_err("Unknown file lock!\n"); goto err; } @@ -67,7 +67,7 @@ static int fill_flock_entry(FileLockEntry *fle, const char *fl_flag, } else if (!strcmp(fl_option, "WRITE")) { fle->type |= LOCK_WRITE; } else { - pr_err("Unknow lock option!\n"); + pr_err("Unknown lock option!\n"); goto err; } } else { @@ -78,7 +78,7 @@ static int fill_flock_entry(FileLockEntry *fle, const char *fl_flag, } else if (!strcmp(fl_option, "READ")) { fle->type |= F_RDLCK; } else { - pr_err("Unknow lock option!\n"); + pr_err("Unknown lock option!\n"); goto err; } } @@ -175,7 +175,7 @@ static int restore_file_lock(FileLockEntry *fle) } else if (fle->type == F_UNLCK) { cmd = LOCK_UN; } else { - pr_err("Unknow flock type!\n"); + pr_err("Unknown flock type!\n"); goto err; } @@ -208,7 +208,7 @@ static int restore_file_lock(FileLockEntry *fle) goto err; } } else { - pr_err("Unknow file lock style!\n"); + pr_err("Unknown file lock style!\n"); goto err; } diff --git a/files.c b/files.c index 55f264048..ba84e7b33 100644 --- a/files.c +++ b/files.c @@ -776,7 +776,7 @@ int prepare_fds(struct pstree_item *me) futex_wait_while_lt(&fdt->fdt_lock, fdt->nr); if (fdt->pid != me->pid.virt) { - pr_info("File descriptor talbe is shared with %d\n", fdt->pid); + pr_info("File descriptor table is shared with %d\n", fdt->pid); futex_wait_until(&fdt->fdt_lock, fdt->nr + 1); goto out; } diff --git a/fsnotify.c b/fsnotify.c index 77a9366a8..cb44f5ee6 100644 --- a/fsnotify.c +++ b/fsnotify.c @@ -278,7 +278,7 @@ static int restore_one_inotify(int inotify_fd, struct fsnotify_mark_info *info) ret = 0; break; } else if (wd > iwe->wd) { - pr_err("Usorted watch found for %d with %d\n", inotify_fd, iwe->wd); + pr_err("Unsorted watch found for %d with %d\n", inotify_fd, iwe->wd); break; } diff --git a/mount.c b/mount.c index f63fb544d..6d7ebe467 100644 --- a/mount.c +++ b/mount.c @@ -606,7 +606,7 @@ static int cr_pivot_root() return -1; } if (mkdtemp(put_root) == NULL) { - pr_perror("Can't create a temparary directory"); + pr_perror("Can't create a temporary directory"); return -1; } diff --git a/net.c b/net.c index 53c8ab74c..1d4a00ce7 100644 --- a/net.c +++ b/net.c @@ -146,7 +146,7 @@ static int dump_links(struct cr_fdset *fds) static int restore_link_cb(struct nlmsghdr *hdr, void *arg) { - pr_info("Got responce on SETLINK =)\n"); + pr_info("Got response on SETLINK =)\n"); return 0; } diff --git a/page-read.c b/page-read.c index 1626c28c4..4392ab24f 100644 --- a/page-read.c +++ b/page-read.c @@ -29,7 +29,7 @@ static int read_page(struct page_read *pr, unsigned long vaddr, void *buf) ret = read(pr->fd_pg, buf, PAGE_SIZE); if (ret != PAGE_SIZE) { - pr_err("Can'r read mapping page %d\n", ret); + pr_err("Can't read mapping page %d\n", ret); return -1; } @@ -122,7 +122,7 @@ static int read_pagemap_page(struct page_read *pr, unsigned long vaddr, void *bu vaddr, pr->cvaddr, lseek(pr->fd_pg, 0, SEEK_CUR)); ret = read(pr->fd_pg, buf, PAGE_SIZE); if (ret != PAGE_SIZE) { - pr_err("Can'r read mapping page %d\n", ret); + pr_err("Can't read mapping page %d\n", ret); return -1; } } diff --git a/ptrace.c b/ptrace.c index a3f7da6ce..96147671b 100644 --- a/ptrace.c +++ b/ptrace.c @@ -22,7 +22,7 @@ int unseize_task(pid_t pid, int st) { - pr_debug("\tUnseizeing %d into %d\n", pid, st); + pr_debug("\tUnseizing %d into %d\n", pid, st); if (st == TASK_DEAD) kill(pid, SIGKILL); @@ -73,9 +73,9 @@ int seize_task(pid_t pid, pid_t ppid, pid_t *pgid, pid_t *sid) if (ret < 0) { if (ps.state != 'Z') { if (pid == getpid()) - pr_err("The crtools itself is withing dumped tree.\n"); + pr_err("The crtools itself is within dumped tree.\n"); else - pr_err("Unseizeable non-zombie %d found, state %c, err %d/%d\n", + pr_err("Unseizable non-zombie %d found, state %c, err %d/%d\n", pid, ps.state, ret, ptrace_errno); return -1; } diff --git a/sk-inet.c b/sk-inet.c index 9d753d73e..e207a16ea 100644 --- a/sk-inet.c +++ b/sk-inet.c @@ -197,7 +197,7 @@ static struct inet_sk_desc *gen_uncon_sk(int lfd, const struct fd_parms *p, int aux = sizeof(info); ret = getsockopt(lfd, SOL_TCP, TCP_INFO, &info, &aux); if (ret) { - pr_perror("Failt to obtain TCP_INFO"); + pr_perror("Failed to obtain TCP_INFO"); goto err; } diff --git a/sk-tcp.c b/sk-tcp.c index e2c1b97d0..e5e67d2f3 100644 --- a/sk-tcp.c +++ b/sk-tcp.c @@ -62,7 +62,7 @@ static int refresh_inet_sk(struct inet_sk_desc *sk) struct tcp_info info; if (dump_opt(sk->rfd, SOL_TCP, TCP_INFO, &info)) { - pr_perror("Failt to obtain TCP_INFO"); + pr_perror("Failed to obtain TCP_INFO"); return -1; } @@ -317,7 +317,7 @@ static int dump_tcp_conn_state(struct inet_sk_desc *sk) * Initial options */ - pr_info("Reasing options for socket\n"); + pr_info("Reading options for socket\n"); ret = tcp_stream_get_options(sk->rfd, &tse); if (ret < 0) goto err_opt; diff --git a/sockets.c b/sockets.c index 5cd12fb0a..f9ef81e9d 100644 --- a/sockets.c +++ b/sockets.c @@ -608,7 +608,7 @@ int collect_sockets(int pid) tmp = do_collect_req(nl, &req, sizeof(req), packet_receive_one, NULL); if (tmp) { if (pid != 0 && tmp == -ENOENT) /* Fedora 19 */ - pr_warn("The currect kernel doesn't support packet_diag\n"); + pr_warn("The current kernel doesn't support packet_diag\n"); else err = tmp; } @@ -619,7 +619,7 @@ int collect_sockets(int pid) tmp = do_collect_req(nl, &req, sizeof(req), netlink_receive_one, NULL); if (tmp) { if (pid != 0 && tmp == -ENOENT) /* Going to be in 3.10 */ - pr_warn("The currect kernel doesn't support netlink_diag\n"); + pr_warn("The current kernel doesn't support netlink_diag\n"); else err = tmp; } diff --git a/tty.c b/tty.c index 431f3e450..5db688797 100644 --- a/tty.c +++ b/tty.c @@ -1201,7 +1201,7 @@ int tty_prep_fds(struct cr_options *opts) return 0; if (!isatty(STDIN_FILENO)) { - pr_err("Standart stream is not a terminal, aborting\n"); + pr_err("Standard stream is not a terminal, aborting\n"); return -1; } diff --git a/util.c b/util.c index 23cc2082f..a77a7004a 100644 --- a/util.c +++ b/util.c @@ -361,7 +361,7 @@ int clone_service_fd(int id) if (ret == -1) { if (errno == EBADF) continue; - pr_perror("Unalbe to clone %d->%d\n", old, new); + pr_perror("Unable to clone %d->%d\n", old, new); } }