[CRIU] [PATCH 4/4] Assorted error messages fixed

[Pavel Emelyanov]

On 01/30/2012 09:18 PM, Kir Kolyshkin wrote:
> ... to sound more English.
> 
> Signed-off-by: Kir Kolyshkin <kir at openvz.org>

Acked-by: Pavel Emelyanov <xemul at parallels.com>

Thanks, Kir ;)

> ---
>  cr-dump.c    |    4 ++--
>  cr-restore.c |    4 ++--
>  crtools.c    |    7 ++++---
>  3 files changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/cr-dump.c b/cr-dump.c
> index 286ff01..94784bb 100644
> --- a/cr-dump.c
> +++ b/cr-dump.c
> @@ -1123,7 +1123,7 @@ static int dump_one_zombie(struct pstree_item *item, struct proc_pid_stat *pps,
>  	struct core_entry *core;
>  
>  	if (item->nr_children) {
> -		pr_err("Zombie %d with kids?\n", item->pid);
> +		pr_err("Zombie %d with children?\n", item->pid);
>  		return -1;
>  	}
>  
> @@ -1220,7 +1220,7 @@ static int dump_one_task(struct pstree_item *item, struct cr_fdset *cr_fdset)
>  
>  	ret = collect_mappings(pid, pid_dir, &vma_area_list);
>  	if (ret) {
> -		pr_err("Collect mappings (pid: %d) failed with %d\n", pid, ret);
> +		pr_err("Collecting mappings (pid: %d) failed with %d\n", pid, ret);
>  		goto err;
>  	}
>  
> diff --git a/cr-restore.c b/cr-restore.c
> index 5874892..5f278b9 100644
> --- a/cr-restore.c
> +++ b/cr-restore.c
> @@ -784,7 +784,7 @@ static int restore_pipe_data(struct pipe_entry *e, int wfd, int pipes_fd)
>  	while (size != e->bytes) {
>  		ret = splice(pipes_fd, NULL, wfd, NULL, e->bytes, 0);
>  		if (ret < 0) {
> -			pr_perror("\t%x: Error splicing data", e->pipeid);
> +			4r_perror("\t%x: Error splicing data", e->pipeid);
>  			return -1;
>  		}
>  		if (ret == 0) {
> @@ -1235,7 +1235,7 @@ static inline int fork_with_pid(int pid, unsigned long ns_clone_flags)
>  	stack = mmap(NULL, STACK_SIZE, PROT_WRITE | PROT_READ,
>  			MAP_PRIVATE | MAP_GROWSDOWN | MAP_ANONYMOUS, -1, 0);
>  	if (stack == MAP_FAILED) {
> -		pr_perror("Failed to map stack for kid");
> +		pr_perror("Failed to map stack for a child");
>  		goto err;
>  	}
>  
> diff --git a/crtools.c b/crtools.c
> index 560c609..b2ab3ab 100644
> --- a/crtools.c
> +++ b/crtools.c
> @@ -278,7 +278,8 @@ int main(int argc, char *argv[])
>  			break;
>  		case 'D':
>  			if (chdir(optarg)) {
> -				pr_perror("can't change working directory");
> +				pr_perror("Can't change directory to %s",
> +						optarg);
>  				return -1;
>  			}
>  			break;
> @@ -303,7 +304,7 @@ int main(int argc, char *argv[])
>  	}
>  
>  	if (!getcwd(image_dir, sizeof(image_dir))) {
> -		pr_perror("can't get currect directory");
> +		pr_perror("Can't get currect directory");
>  		return -1;
>  	}
>  
> @@ -360,6 +361,6 @@ usage:
>  	return -1;
>  
>  opt_pid_missing:
> -	printk("No pid specified, -t or -p option missed?\n");
> +	printk("No pid specified (-t or -p option missing)\n");
>  	return -1;
>  }