diff options
| author | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-06-14 11:51:25 +0200 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-06-14 22:12:04 +0200 |
| commit | 3e51d893ed3d1273b5487e05196f00fe3d14773d (patch) | |
| tree | f542745888ce0d12132e88a319ccdac275ac42ea /src/server | |
| parent | 9132f7083d01510eb1c2471a7c3f3247e35cdf3b (diff) | |
| download | openocd+libswd-3e51d893ed3d1273b5487e05196f00fe3d14773d.tar.gz openocd+libswd-3e51d893ed3d1273b5487e05196f00fe3d14773d.tar.bz2 openocd+libswd-3e51d893ed3d1273b5487e05196f00fe3d14773d.tar.xz openocd+libswd-3e51d893ed3d1273b5487e05196f00fe3d14773d.zip | |
-Wshadow fixes
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/server.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/server.c b/src/server/server.c index 57c40162..7d8ad517 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -264,7 +264,7 @@ int server_loop(struct command_context *command_context) { struct service *service; - bool poll = true; + bool poll_ok = true; /* used in select() */ fd_set read_fds; @@ -322,7 +322,7 @@ int server_loop(struct command_context *command_context) struct timeval tv; tv.tv_sec = 0; - if (poll) + if (poll_ok) { /* we're just polling this iteration, this is faster on embedded * hosts */ @@ -375,11 +375,11 @@ int server_loop(struct command_context *command_context) FD_ZERO(&read_fds); /* eCos leaves read_fds unchanged in this case! */ /* We timed out/there was nothing to do, timeout rather than poll next time */ - poll = false; + poll_ok = false; } else { /* There was something to do, next time we'll just poll */ - poll = true; + poll_ok = true; } for (service = services; service; service = service->next) |