global: Replace timeout_add_short(0) calls with io_set_pending() where possible

These timeouts were added before io_set_pending() existed. This won't fix
anything, but makes the code cleaner.

diff --git a/src/doveadm/server-connection.c b/src/doveadm/server-connection.c
index 5e0629628052b32dc9d6fcf0aca3195cd8f16bad..9ffa23e40e7508754b18b866e042a2dbe537e894 100644 (file)
--- a/src/doveadm/server-connection.c
+++ b/src/doveadm/server-connection.c
@@ -50,7 +50,6 @@ struct server_connection {
        struct istream *log_input;
        struct ostream *output;
        struct ssl_iostream *ssl_iostream;
-       struct timeout *to_input;
 
        struct istream *cmd_input;
        struct ostream *cmd_output;
@@ -97,8 +96,7 @@ static void server_print_connection_released(struct doveadm_server *server)
 
                conns[i]->io = io_add(conns[i]->fd, IO_READ,
                                      server_connection_input, conns[i]);
-               conns[i]->to_input = timeout_add_short(0,
-                       server_connection_input, conns[i]);
+               io_set_pending(conns[i]->io);
        }
 }
 
@@ -344,8 +342,6 @@ static void server_connection_input(struct server_connection *conn)
 {
        const char *line;
 
-       timeout_remove(&conn->to_input);
-
        if (i_stream_read(conn->input) < 0) {
                /* disconnected */
                server_log_disconnect_error(conn);
@@ -588,7 +584,6 @@ void server_connection_destroy(struct server_connection **_conn)
        if (printing_conn == conn)
                print_connection_released();
 
-       timeout_remove(&conn->to_input);
        i_stream_destroy(&conn->input);
        o_stream_destroy(&conn->output);
        i_stream_destroy(&conn->cmd_input);

diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c
index 3ad64a63f6a9fb22ea54ed838394e84c4c06023b..0b7d2d3cda5c72d0175d40d19cadc36c08bda4ec 100644 (file)
--- a/src/imap/imap-client.c
+++ b/src/imap/imap-client.c
@@ -478,7 +478,6 @@ static void client_default_destroy(struct client *client, const char *reason)
                imap_parser_unref(&client->free_parser);
        io_remove(&client->io);
        timeout_remove(&client->to_idle_output);
-       timeout_remove(&client->to_delayed_input);
        timeout_remove(&client->to_idle);
 
        /* i/ostreams are already closed at this stage, so fd can be closed */
@@ -1004,10 +1003,7 @@ void client_command_free(struct client_command_context **_cmd)
        if (state == CLIENT_COMMAND_STATE_WAIT_EXTERNAL &&
            !client->disconnected) {
                client_add_missing_io(client);
-               if (client->to_delayed_input == NULL) {
-                       client->to_delayed_input =
-                               timeout_add(0, client_input, client);
-               }
+               io_set_pending(client->io);
        }
 }
 
@@ -1320,8 +1316,6 @@ void client_input(struct client *client)
        client->last_input = ioloop_time;
        timeout_reset(client->to_idle);
 
-       timeout_remove(&client->to_delayed_input);
-
        bytes = i_stream_read(client->input);
        if (bytes == -1) {
                /* disconnected */

diff --git a/src/imap/imap-master-client.c b/src/imap/imap-master-client.c
index 7b1fc61771e72fe39f3a8946c228a1487ae7d2bf..9e4b872e972f7d2298aa3e4c7db8f194d13f265a 100644 (file)
--- a/src/imap/imap-master-client.c
+++ b/src/imap/imap-master-client.c
@@ -281,13 +281,11 @@ imap_master_client_input_args(struct connection *conn, const char *const *args,
                imap_state_import_idle_cmd_tag(imap_client, master_input.tag);
 
        /* make sure all pending input gets handled */
-       i_assert(imap_client->to_delayed_input == NULL);
        if (master_input.client_input->used > 0) {
                e_debug(imap_client->event,
                        "imap-master: Pending client input: '%s'",
                        str_sanitize(str_c(master_input.client_input), 128));
-               imap_client->to_delayed_input =
-                       timeout_add(0, client_input, imap_client);
+               io_set_pending(imap_client->io);
        }
 
        imap_refresh_proctitle();