From 0bfb9d476c3dfc1ed74763665611891bcc277e9e Mon Sep 17 00:00:00 2001 From: Aris Adamantiadis Date: Sun, 29 Nov 2009 22:51:14 +0100 Subject: Standardize callbacks style and add documentation --- libssh/socket.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libssh/socket.c') diff --git a/libssh/socket.c b/libssh/socket.c index cb96e8da..8acc76ce 100644 --- a/libssh/socket.c +++ b/libssh/socket.c @@ -153,8 +153,9 @@ int ssh_socket_pollcallback(ssh_poll_handle p, int fd, int revents, void *v_s){ /* Bufferize the data and then call the callback */ buffer_add_data(s->in_buffer,buffer,r); if(s->callbacks){ - r= s->callbacks->data(s->callbacks->user, - buffer_get_rest(s->in_buffer), buffer_get_rest_len(s->in_buffer)); + r= s->callbacks->data(buffer_get_rest(s->in_buffer), + buffer_get_rest_len(s->in_buffer), + s->callbacks->user); buffer_pass_bytes(s->in_buffer,r); } } @@ -167,7 +168,7 @@ int ssh_socket_pollcallback(ssh_poll_handle p, int fd, int revents, void *v_s){ buffer_get_rest_len(s->out_buffer)); } else if(s->callbacks){ /* Otherwise advertise the upper level that write can be done */ - s->callbacks->controlflow(s->callbacks->user,SSH_SOCKET_FLOW_WRITEWONTBLOCK); + s->callbacks->controlflow(SSH_SOCKET_FLOW_WRITEWONTBLOCK,s->callbacks->user); ssh_poll_set_events(p,ssh_poll_get_events(p) & ~POLLOUT); /* TODO: Find a way to put back POLLOUT when buffering occurs */ } -- cgit v1.2.3