Module: wine Branch: master Commit: 9ed42d2709fe336d8ee32f9f00a8adacd7cfa925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed42d2709fe336d8ee32f9f00...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Dec 26 12:27:48 2008 +0100
server: Get rid of the unused count parameter in fd_queue_async().
---
server/change.c | 2 +- server/device.c | 2 +- server/fd.c | 4 ++-- server/file.h | 2 +- server/mailslot.c | 2 +- server/named_pipe.c | 4 ++-- server/serial.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/server/change.c b/server/change.c index d731a9c..63985f4 100644 --- a/server/change.c +++ b/server/change.c @@ -1144,7 +1144,7 @@ DECL_HANDLER(read_directory_changes) return;
/* requests don't timeout */ - if (!(async = fd_queue_async( dir->fd, &req->async, ASYNC_TYPE_WAIT, 0 ))) goto end; + if (!(async = fd_queue_async( dir->fd, &req->async, ASYNC_TYPE_WAIT ))) goto end;
/* assign it once */ if (!dir->filter) diff --git a/server/device.c b/server/device.c index abf0ac5..754b257 100644 --- a/server/device.c +++ b/server/device.c @@ -332,7 +332,7 @@ static obj_handle_t device_ioctl( struct fd *fd, ioctl_code_t code, const async_ return 0; }
- if (!(ioctl->async = fd_queue_async( device->fd, async_data, ASYNC_TYPE_WAIT, 0 ))) + if (!(ioctl->async = fd_queue_async( device->fd, async_data, ASYNC_TYPE_WAIT ))) { close_handle( current->process, handle ); release_object( ioctl ); diff --git a/server/fd.c b/server/fd.c index 7f01c39..09b93ce 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1769,7 +1769,7 @@ void default_poll_event( struct fd *fd, int event ) else if (!fd->inode) set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); }
-struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) +struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type ) { struct async_queue *queue; struct async *async; @@ -1830,7 +1830,7 @@ void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, { struct async *async;
- if ((async = fd_queue_async( fd, data, type, count ))) + if ((async = fd_queue_async( fd, data, type ))) { release_object( async ); set_error( STATUS_PENDING ); diff --git a/server/file.h b/server/file.h index 00b1fa7..b9a83c3 100644 --- a/server/file.h +++ b/server/file.h @@ -75,7 +75,7 @@ extern int default_fd_signaled( struct object *obj, struct thread *thread ); extern unsigned int default_fd_map_access( struct object *obj, unsigned int access ); extern int default_fd_get_poll_events( struct fd *fd ); extern void default_poll_event( struct fd *fd, int event ); -extern struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); +extern struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type ); extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, diff --git a/server/mailslot.c b/server/mailslot.c index e223b83..97da8d2 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -307,7 +307,7 @@ static void mailslot_queue_async( struct fd *fd, const async_data_t *data, int t
assert(mailslot->obj.ops == &mailslot_ops);
- if ((async = fd_queue_async( fd, data, type, count ))) + if ((async = fd_queue_async( fd, data, type ))) { async_set_timeout( async, mailslot->read_timeout ? mailslot->read_timeout : -1, STATUS_IO_TIMEOUT ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 6db9a7a..e9cb14a 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -610,13 +610,13 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a async_data_t new_data = *async_data; if (!(wait_handle = alloc_wait_event( current->process ))) break; new_data.event = wait_handle; - if (!(async = fd_queue_async( server->ioctl_fd, &new_data, ASYNC_TYPE_WAIT, 0 ))) + if (!(async = fd_queue_async( server->ioctl_fd, &new_data, ASYNC_TYPE_WAIT ))) { close_handle( current->process, wait_handle ); break; } } - else async = fd_queue_async( server->ioctl_fd, async_data, ASYNC_TYPE_WAIT, 0 ); + else async = fd_queue_async( server->ioctl_fd, async_data, ASYNC_TYPE_WAIT );
if (async) { diff --git a/server/serial.c b/server/serial.c index d1b3822..6fa60e5 100644 --- a/server/serial.c +++ b/server/serial.c @@ -188,7 +188,7 @@ static void serial_queue_async( struct fd *fd, const async_data_t *data, int typ break; }
- if ((async = fd_queue_async( fd, data, type, count ))) + if ((async = fd_queue_async( fd, data, type ))) { if (timeout) async_set_timeout( async, timeout * -10000, STATUS_TIMEOUT ); release_object( async );