summaryrefslogtreecommitdiffstats
path: root/client.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2008-06-19 19:36:55 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2008-06-19 19:36:55 +0000
commit36e3f31f23394911e7d7aca8973be613daeb605a (patch)
treea7474ea2da41e73c8c9baca9c2331be1747ba023 /client.c
parent9ef5bdc7c058854f902dd42f79b6b7454331a98e (diff)
Stupid ncurses.
Diffstat (limited to 'client.c')
-rw-r--r--client.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/client.c b/client.c
index de9b0d07..918bd543 100644
--- a/client.c
+++ b/client.c
@@ -1,4 +1,4 @@
-/* $Id: client.c,v 1.31 2008-06-18 20:58:03 nicm Exp $ */
+/* $Id: client.c,v 1.32 2008-06-19 19:36:55 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -127,7 +127,7 @@ client_main(struct client_ctx *cctx)
{
struct pollfd pfd;
char *error;
- int timeout;
+ int xtimeout; /* Yay for ncurses namespace! */
siginit();
@@ -137,7 +137,7 @@ client_main(struct client_ctx *cctx)
#endif
error = NULL;
- timeout = INFTIM;
+ xtimeout = INFTIM;
while (!sigterm) {
if (sigwinch)
client_handle_winch(cctx);
@@ -147,11 +147,11 @@ client_main(struct client_ctx *cctx)
goto out;
case 0:
/* May be more in buffer, don't let poll block. */
- timeout = 0;
+ xtimeout = 0;
break;
default:
/* Out of data, poll may block. */
- timeout = INFTIM;
+ xtimeout = INFTIM;
break;
}
@@ -160,7 +160,7 @@ client_main(struct client_ctx *cctx)
if (BUFFER_USED(cctx->srv_out) > 0)
pfd.events |= POLLOUT;
- if (poll(&pfd, 1, timeout) == -1) {
+ if (poll(&pfd, 1, xtimeout) == -1) {
if (errno == EAGAIN || errno == EINTR)
continue;
fatal("poll failed");