[CRIU] [crtools-bot for Kir Kolyshkin ] sockets.c: Fix/unify some
error messages
Cyrill Gorcunov
gorcunov at openvz.org
Fri Feb 10 09:07:19 EST 2012
The commit is pushed to "master" and will appear on git://github.com/cyrillos/crtools.git
------>
commit d5fa75c0043f82751ae72410b5fafb32f909162c
Author: Kir Kolyshkin <kir at openvz.org>
Date: Fri Feb 10 17:53:55 2012 +0400
sockets.c: Fix/unify some error messages
Signed-off-by: Kir Kolyshkin <kir at openvz.org>
Acked-by: Pavel Emelyanov <xemul at parallels.com>
Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
sockets.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sockets.c b/sockets.c
index 542530b..91ebd40 100644
--- a/sockets.c
+++ b/sockets.c
@@ -805,12 +805,12 @@ static int schedule_acc_job(int sk, struct unix_sk_entry *ue)
prep_conn_addr(ue->id, &addr, &len);
if (bind(sk, (struct sockaddr *)&addr, len) < 0) {
- pr_perror("Can't bind socket");
+ pr_perror("Can't bind to a socket");
goto err;
}
if (listen(sk, 1) < 0) {
- pr_perror("Can't listen socket");
+ pr_perror("Can't listen on a socket");
goto err;
}
@@ -860,7 +860,7 @@ static int bind_unix_sk_to_addr(int sk, struct sockaddr_un *addr, int addrlen,
struct unix_sk_listen *e;
if (bind(sk, (struct sockaddr *)addr, addrlen) < 0) {
- pr_perror("Can't bind socket");
+ pr_perror("Can't bind to a socket");
goto err;
}
@@ -943,7 +943,7 @@ static int open_unix_sk_stream(int sk, struct unix_sk_entry *ue, int img_fd)
ret = listen(sk, ue->backlog);
if (ret < 0) {
- pr_perror("Can't listen socket");
+ pr_perror("Can't listen on a socket");
goto out;
}
} else if (ue->state == TCP_ESTABLISHED) {
@@ -1069,12 +1069,12 @@ static int open_inet_sk(struct inet_sk_entry *ie, int *img_fd)
memcpy(&addr.sin_addr.s_addr, ie->src_addr, sizeof(unsigned int) * 4);
if (bind(sk, (struct sockaddr *) &addr, sizeof(addr)) == -1) {
- pr_perror("Inet socket bind failed");
+ pr_perror("Can't bind to a socket");
goto err;
}
if (listen(sk, ie->backlog) == -1) {
- pr_perror("listen() failed on %d", sk);
+ pr_perror("Can't listen on a socket");
goto err;
}
More information about the CRIU
mailing list