We never pass a handle to this object to the client anyway.
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- server/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/sock.c b/server/sock.c index 3aed5494612..8ab7d5b7236 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1536,7 +1536,7 @@ static const struct object_ops ifchange_ops = sizeof(struct ifchange), /* size */ &no_type, /* type */ ifchange_dump, /* dump */ - add_queue, /* add_queue */ + no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ no_satisfied, /* satisfied */
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- server/event.c | 2 +- server/object.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/server/event.c b/server/event.c index c45c093e9d3..ccdd465dd5b 100644 --- a/server/event.c +++ b/server/event.c @@ -160,7 +160,7 @@ struct event *get_event_obj( struct process *process, obj_handle_t handle, unsig return (struct event *)get_handle_obj( process, handle, access, &event_ops ); }
-void pulse_event( struct event *event ) +static void pulse_event( struct event *event ) { event->signaled = 1; /* wake up all waiters if manual reset, a single one otherwise */ diff --git a/server/object.h b/server/object.h index 5b2c309f0b2..1aef43018b2 100644 --- a/server/object.h +++ b/server/object.h @@ -215,7 +215,6 @@ extern struct keyed_event *create_keyed_event( struct object *root, const struct unsigned int attr, const struct security_descriptor *sd ); extern struct event *get_event_obj( struct process *process, obj_handle_t handle, unsigned int access ); extern struct keyed_event *get_keyed_event_obj( struct process *process, obj_handle_t handle, unsigned int access ); -extern void pulse_event( struct event *event ); extern void set_event( struct event *event ); extern void reset_event( struct event *event );
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- server/sock.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/server/sock.c b/server/sock.c index 8ab7d5b7236..775ec6edf32 100644 --- a/server/sock.c +++ b/server/sock.c @@ -163,7 +163,6 @@ struct sock };
static void sock_dump( struct object *obj, int verbose ); -static int sock_signaled( struct object *obj, struct wait_queue_entry *entry ); static struct fd *sock_get_fd( struct object *obj ); static int sock_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void sock_destroy( struct object *obj ); @@ -189,7 +188,7 @@ static const struct object_ops sock_ops = sock_dump, /* dump */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ - sock_signaled, /* signaled */ + default_fd_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ sock_get_fd, /* get_fd */ @@ -773,10 +772,6 @@ static void sock_poll_event( struct fd *fd, int event ) event = sock_dispatch_asyncs( sock, event, error ); sock_dispatch_events( sock, prevstate, event, error );
- /* if anyone is stupid enough to wait on the socket object itself, - * maybe we should wake them up too, just in case? */ - wake_up( &sock->obj, 0 ); - sock_reselect( sock ); }
@@ -789,14 +784,6 @@ static void sock_dump( struct object *obj, int verbose ) sock->mask, sock->pmask, sock->hmask ); }
-static int sock_signaled( struct object *obj, struct wait_queue_entry *entry ) -{ - struct sock *sock = (struct sock *)obj; - assert( obj->ops == &sock_ops ); - - return check_fd_events( sock->fd, sock_get_poll_events( sock->fd ) ) != 0; -} - static int sock_get_poll_events( struct fd *fd ) { struct sock *sock = get_fd_user( fd );
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- server/protocol.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/protocol.def b/server/protocol.def index 7f3b785df51..51e39b5f09a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -668,7 +668,7 @@ typedef union } map_view; struct { - enum apc_type type; /* APC_MAP_VIEW */ + enum apc_type type; /* APC_UNMAP_VIEW */ unsigned int status; /* status returned by call */ } unmap_view; struct
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- server/protocol.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/protocol.def b/server/protocol.def index 51e39b5f09a..86a5b6a1942 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1116,7 +1116,7 @@ typedef struct obj_handle_t dst_process; /* dst process handle */ unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ - unsigned int options; /* duplicate options (see below) */ + unsigned int options; /* duplicate options */ @REPLY obj_handle_t handle; /* duplicated handle in dst process */ int self; /* is the source the current process? */