[CRIU] [crtools-bot] sockets: Fix a few problems if compiled with DEBUG=1

Cyrill Gorcunov gorcunov at openvz.org
Wed Feb 1 08:23:44 EST 2012


The commit is pushed to "master" and will appear on git://github.com/cyrillos/crtools.git
------>
commit 6f589a4f6e59cb0399b0806db919f8b3cd04fe9f
Author: Cyrill Gorcunov <gorcunov at openvz.org>
Date:   Wed Feb 1 16:19:33 2012 +0400

    sockets: Fix a few problems if compiled with DEBUG=1
    
    sockets.c: In function ‘show_one_inet_img’:
    sockets.c:151:2: error: format ‘%d’ expects argument of type ‘int’, but argument 9 has type ‘char *’ [-Werror=format]
    sockets.c: In function ‘open_unix_sk_stream’:
    sockets.c:925:10: error: unknown escape sequence: '\C' [-Werror]
    
    Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
    Acked-by: Pavel Emelyanov <xemul at parallels.com>
---
 sockets.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sockets.c b/sockets.c
index 1c6d29c..14bad10 100644
--- a/sockets.c
+++ b/sockets.c
@@ -149,7 +149,7 @@ static void show_one_inet_img(char *act, struct inet_sk_entry *e)
 	}
 
 	dprintk("\t%s: fd %d family %d type %d proto %d port %d "
-		"state %d src_addr %d\n",
+		"state %d src_addr %s\n",
 		act, e->fd, e->family, e->type, e->proto, e->src_port, e->state,
 		src_addr);
 }
@@ -938,7 +938,7 @@ static int open_unix_sk_stream(int sk, struct unix_sk_entry *ue, int img_fd)
 		e->addrlen	= sizeof(e->addr.sun_family) + ue->namelen;
 		e->ino		= ue->id;
 
-		dprintk("\t\Collected listening socket %d\n", ue->id);
+		dprintk("\tCollected listening socket %d\n", ue->id);
 
 	} else if (ue->state == TCP_ESTABLISHED) {
 


More information about the CRIU mailing list