Commit 482fac6c authored by Per Cederqvist's avatar Per Cederqvist
Browse files

(isc_create): Don't set data_available_user, which has been removed.

(stale_cb): Adjusted to the new API of the callback functions.
(idle_cb): Ditto.
(isc_set_read_callback): Removed the user argument.
(isc_check_read_callback): Pass the isc_scb object instead of the
	user-supplied pointer to the on_fd.
parent 8352983f
......@@ -186,7 +186,6 @@ isc_create(struct isc_mcb *mcb,
scb->data_available_registered = 0;
scb->data_available_callback = NULL;
scb->stale_output_cb = NULL;
scb->data_available_user = NULL;
scb->acceptable_idle_time = cfg->idle_timeout;
scb->cfg = cfg;
......@@ -211,7 +210,7 @@ stale_cb(oop_source *UNUSED(src),
if (scb->stale_output_cb == NULL)
return OOP_HALT;
scb->stale_output_cb(scb->pub.master, &scb->pub, scb->data_available_user);
scb->stale_output_cb(&scb->pub);
return OOP_CONTINUE;
}
......@@ -226,7 +225,7 @@ idle_cb(oop_source *UNUSED(src),
if (scb->idle_cb == NULL)
return OOP_HALT;
scb->idle_cb(scb->pub.master, &scb->pub, scb->data_available_user);
scb->idle_cb(&scb->pub);
return OOP_CONTINUE;
}
......@@ -259,8 +258,7 @@ isc_set_read_callback(struct isc_scb *scb,
oop_call_fd *data_available_callback,
isc_write_error_cb *write_error_cb,
isc_stale_output_cb *stale_output_cb,
isc_stale_output_cb *idle_output_cb,
void *user)
isc_stale_output_cb *idle_output_cb)
{
struct isc_scb_internal *session = (struct isc_scb_internal*)scb;
......@@ -269,7 +267,6 @@ isc_set_read_callback(struct isc_scb *scb,
isc_cancel_idle_callback(session);
session->data_available_callback = data_available_callback;
session->data_available_user = user;
session->write_err_cb = write_error_cb;
session->stale_output_cb = stale_output_cb;
session->idle_cb = idle_output_cb;
......@@ -315,7 +312,7 @@ isc_check_read_callback(struct isc_scb_internal *session,
{
source->on_fd(source, session->pub.fd, OOP_READ,
session->data_available_callback,
session->data_available_user);
&session->pub);
session->data_available_registered = 1;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment