]> xenbits.xensource.com Git - xen.git/commitdiff
tools/console: Fix build after "xenconsole tolerate tty errors"
authorIan Jackson <ian.jackson@eu.citrix.com>
Wed, 21 Oct 2015 14:10:22 +0000 (15:10 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 21 Oct 2015 14:10:22 +0000 (15:10 +0100)
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 <Ian.Jackson@eu.citrix.com>
tools/console/client/main.c

index fcab3b975301abc3cce888ea3024035d762e1b80..8ef309f97422c1cf9ccad7f96e0c26b642074803 100644 (file)
@@ -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);