From 80a11b92a47cb8278c074f83f9ea29b7825eaa74 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 21 Oct 2015 15:10:22 +0100 Subject: [PATCH] tools/console: Fix build after "xenconsole tolerate tty errors" 2ddcdd96 "tools/console: xenconsole tolerate tty errors" contains a compile error introduced during conflict resolution of the backport from 4.4 to 4.3: client/main.c: In function 'get_pty_fd': client/main.c:124:10: error: passing argument 1 of 'warn' makes pointer from integer without a cast [-Werror] In file included from client/main.c:35:0: /usr/include/err.h:35:13: note: expected 'const char *' but argument is of type 'int' Fix this. Signed-off-by: Ian Jackson (cherry picked from commit 85ca813ec23c5a60680e4a13777dad530065902b) --- tools/console/client/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/console/client/main.c b/tools/console/client/main.c index fcab3b9753..8ef309f974 100644 --- a/tools/console/client/main.c +++ b/tools/console/client/main.c @@ -120,7 +120,7 @@ static int get_pty_fd(struct xs_handle *xs, char *path, int seconds) continue; pty_fd = open(pty_path, O_RDWR | O_NOCTTY); if (pty_fd == -1) - warn(errno, "Could not open tty `%s'", + warn("Could not open tty `%s'", pty_path); } free(pty_path); -- 2.39.5