From ca04a99884a9927d00206e437560ce51c56144d3 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Sat, 15 Apr 2006 08:27:48 +0000 Subject: [PATCH] defect 1201 cleanup poll_dispatch_delete in trunk git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@991 fd59a12c-fef9-0310-b244-a6a79926bd2f --- exec/aispoll.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/exec/aispoll.c b/exec/aispoll.c index 974bcf64..242783a5 100644 --- a/exec/aispoll.c +++ b/exec/aispoll.c @@ -245,7 +245,6 @@ int poll_dispatch_delete ( { struct poll_instance *poll_instance; int i; - int found = 0; int res = 0; res = hdb_handle_get (&poll_instance_database, handle, @@ -258,32 +257,15 @@ int poll_dispatch_delete ( /* * Find dispatch fd to delete */ + res = -EBADF; for (i = 0; i < poll_instance->poll_entry_count; i++) { if (poll_instance->poll_entries[i].ufd.fd == fd) { - found = 1; + poll_instance->poll_entries[i].ufd.fd = -1; + poll_instance->poll_entries[i].ufd.revents = 0; break; } } - if (found) { - poll_instance->poll_entries[i].ufd.fd = -1; - poll_instance->poll_entries[i].ufd.revents = 0; - } - - for (i = 0; i < poll_instance->poll_entry_count; i++) { - if (poll_instance->ufds[i].fd == fd) { - found = 1; - break; - } - } - - res = -EBADF; - if (found) { - poll_instance->ufds[i].fd = -1; - poll_instance->ufds[i].revents = 0; - res = 0; - } - hdb_handle_put (&poll_instance_database, handle);