global: io_remove*(NULL) is a no-op

diff --git a/src/lib-ldap/ldap-connection.c b/src/lib-ldap/ldap-connection.c
index 1019072f909b0df120124f73f3a3bd2db514e745..6ac4c616737563bbf444d51d88455db9f2553445 100644 (file)
--- a/src/lib-ldap/ldap-connection.c
+++ b/src/lib-ldap/ldap-connection.c
@@ -548,8 +548,7 @@ int ldap_connection_connect(struct ldap_connection *conn)
 
 void ldap_connection_kill(struct ldap_connection *conn)
 {
-       if (conn->io != NULL)
-               io_remove_closed(&(conn->io));
+       io_remove_closed(&(conn->io));
        timeout_remove(&(conn->to_disconnect));
        timeout_remove(&(conn->to_reconnect));
        if (conn->request_queue != NULL) {

diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c
index f45610e556aabb6ff388193c71de549741b27066..c2d689020696f27ed3fe7dd405b79c07645aa384 100644 (file)
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -1182,8 +1182,7 @@ void master_status_update(struct master_service *service)
            service->last_sent_status_avail_count) {
                /* a) closed, b) updating to same state */
                timeout_remove(&service->to_status);
-               if (service->io_status_write != NULL)
-                       io_remove(&service->io_status_write);
+               io_remove(&service->io_status_write);
                return;
        }
        if (ioloop_time == service->last_sent_status_time &&