lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-10 06:23:01 +03:00
Code Activity

poll: Just make the code a bit more readable.

Browse Source 
Maybe this fixes a cppcheck false positive.
(cherry picked from commit 45c1a23769b63e72e895158bcab83aad31d483dd)
This commit is contained in:
Andreas Schneider
2011-08-23 21:43:06 +02:00
parent e94b0f8c08
commit fa4378d47e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/poll.c
View File

@@ -745,7 +745,8 @@ int ssh_event_add_fd(ssh_event event, socket_t fd, short events,
pw->cb = cb; pw->cb = cb;
pw->userdata = userdata; pw->userdata = userdata;
/* pw is freed by ssh_event_remove_fd */
p = ssh_poll_new(fd, events, ssh_event_fd_wrapper_callback, pw); p = ssh_poll_new(fd, events, ssh_event_fd_wrapper_callback, pw);
if(p == NULL) { if(p == NULL) {
free(pw); free(pw);
@@ -838,7 +839,6 @@ int ssh_event_dopoll(ssh_event event, int timeout) {
* SSH_ERROR on failure * SSH_ERROR on failure
*/ */
int ssh_event_remove_fd(ssh_event event, socket_t fd) { int ssh_event_remove_fd(ssh_event event, socket_t fd) {
ssh_poll_handle p;
register size_t i, used; register size_t i, used;
int rc = SSH_ERROR; int rc = SSH_ERROR;
@@ -849,9 +849,11 @@ int ssh_event_remove_fd(ssh_event event, socket_t fd) {
used = event->ctx->polls_used; used = event->ctx->polls_used;
for (i = 0; i < used; i++) { for (i = 0; i < used; i++) {
if(fd == event->ctx->pollfds[i].fd) { if(fd == event->ctx->pollfds[i].fd) {
p = event->ctx->pollptrs[i]; ssh_poll_handle p = event->ctx->pollptrs[i];
struct ssh_event_fd_wrapper *pw = p->cb_data;
ssh_poll_ctx_remove(event->ctx, p); ssh_poll_ctx_remove(event->ctx, p);
free(p->cb_data); free(pw);
ssh_poll_free(p); ssh_poll_free(p);
rc = SSH_OK; rc = SSH_OK;
/* restart the loop */ /* restart the loop */