zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-19 17:06:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

server: Get rid of no loner used cancel_async from fd_ops.

Browse source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2016-12-01 12:10:34 +01:00 committed by Alexandre Julliard
parent 055918c982
commit ad1e0609a0
14 changed files with 18 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/change.c
View file

@ -189,8 +189,7 @@ static const struct fd_ops dir_fd_ops =
no_fd_flush, /* flush */
default_fd_ioctl, /* ioctl */
default_fd_queue_async, /* queue_async */
default_fd_reselect_async, /* reselect_async */
default_fd_cancel_async /* cancel_async */
default_fd_reselect_async /* reselect_async */
};
static struct list change_list = LIST_INIT(change_list);
@ -701,8 +700,7 @@ static const struct fd_ops inotify_fd_ops =
NULL, /* get_fd_type */
NULL, /* ioctl */
NULL, /* queue_async */
NULL, /* reselect_async */
NULL, /* cancel_async */
NULL /* reselect_async */
};
static int inotify_get_poll_events( struct fd *fd )

3
server/console.c
View file

@ -193,8 +193,7 @@ static const struct fd_ops console_fd_ops =
no_fd_flush, /* flush */
default_fd_ioctl, /* ioctl */
default_fd_queue_async, /* queue_async */
default_fd_reselect_async, /* reselect_async */
default_fd_cancel_async /* cancel_async */
default_fd_reselect_async /* reselect_async */
};
static struct list screen_buffer_list = LIST_INIT(screen_buffer_list);

3
server/device.c
View file

@ -220,8 +220,7 @@ static const struct fd_ops device_file_fd_ops =
device_file_flush, /* flush */
device_file_ioctl, /* ioctl */
default_fd_queue_async, /* queue_async */
default_fd_reselect_async, /* reselect_async */
default_fd_cancel_async /* cancel_async */
default_fd_reselect_async /* reselect_async */
};

6
server/fd.c
View file

@ -2115,12 +2115,6 @@ void default_fd_reselect_async( struct fd *fd, struct async_queue *queue )
}
}
/* default cancel_async() fd routine */
int default_fd_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb )
{
return 0;
}
static inline int is_valid_mounted_device( struct stat *st )
{
#if defined(linux) || defined(__sun__)

3
server/file.c
View file

@ -109,8 +109,7 @@ static const struct fd_ops file_fd_ops =
file_flush, /* flush */
default_fd_ioctl, /* ioctl */
default_fd_queue_async, /* queue_async */
default_fd_reselect_async, /* reselect_async */
default_fd_cancel_async /* cancel_async */
default_fd_reselect_async /* reselect_async */
};
static inline int is_overlapped( const struct file *file )

3
server/file.h
View file

@ -51,8 +51,6 @@ struct fd_ops
void (*queue_async)(struct fd *, const async_data_t *data, int type, int count);
/* selected events for async i/o need an update */
void (*reselect_async)( struct fd *, struct async_queue *queue );
/* cancel an async operation */
int (*cancel_async)(struct fd *, struct process *process, struct thread *thread, client_ptr_t iosb);
};
/* file descriptor functions */
@ -99,7 +97,6 @@ extern obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, const as
extern void no_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count );
extern void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count );
extern void default_fd_reselect_async( struct fd *fd, struct async_queue *queue );
extern int default_fd_cancel_async( struct fd *fd, struct process *process, struct thread *thread, client_ptr_t iosb );
extern void main_loop(void);
extern void remove_process_locks( struct process *process );

9
server/mailslot.c
View file

@ -106,8 +106,7 @@ static const struct fd_ops mailslot_fd_ops =
no_fd_flush, /* flush */
default_fd_ioctl, /* ioctl */
mailslot_queue_async, /* queue_async */
default_fd_reselect_async, /* reselect_async */
default_fd_cancel_async /* cancel_async */
default_fd_reselect_async /* reselect_async */
};
@ -160,8 +159,7 @@ static const struct fd_ops mail_writer_fd_ops =
no_fd_flush, /* flush */
default_fd_ioctl, /* ioctl */
default_fd_queue_async, /* queue_async */
default_fd_reselect_async, /* reselect_async */
default_fd_cancel_async /* cancel_async */
default_fd_reselect_async /* reselect_async */
};
@ -214,8 +212,7 @@ static const struct fd_ops mailslot_device_fd_ops =
no_fd_flush, /* flush */
default_fd_ioctl, /* ioctl */
default_fd_queue_async, /* queue_async */
default_fd_reselect_async, /* reselect_async */
default_fd_cancel_async /* cancel_async */
default_fd_reselect_async /* reselect_async */
};
static void mailslot_destroy( struct object *obj)

3
server/mapping.c
View file

@ -108,8 +108,7 @@ static const struct fd_ops mapping_fd_ops =
no_fd_flush, /* flush */
no_fd_ioctl, /* ioctl */
no_fd_queue_async, /* queue_async */
default_fd_reselect_async, /* reselect_async */
default_fd_cancel_async /* cancel_async */
default_fd_reselect_async /* reselect_async */
};
static struct list shared_list = LIST_INIT(shared_list);

9
server/named_pipe.c
View file

@ -179,8 +179,7 @@ static const struct fd_ops pipe_server_fd_ops =
pipe_server_flush, /* flush */
pipe_server_ioctl, /* ioctl */
default_fd_queue_async, /* queue_async */
default_fd_reselect_async, /* reselect_async */
default_fd_cancel_async, /* cancel_async */
default_fd_reselect_async /* reselect_async */
};
/* client end functions */
@ -223,8 +222,7 @@ static const struct fd_ops pipe_client_fd_ops =
pipe_client_flush, /* flush */
default_fd_ioctl, /* ioctl */
default_fd_queue_async, /* queue_async */
default_fd_reselect_async, /* reselect_async */
default_fd_cancel_async /* cancel_async */
default_fd_reselect_async /* reselect_async */
};
static void named_pipe_device_dump( struct object *obj, int verbose );
@ -271,8 +269,7 @@ static const struct fd_ops named_pipe_device_fd_ops =
no_fd_flush, /* flush */
named_pipe_device_ioctl, /* ioctl */
default_fd_queue_async, /* queue_async */
default_fd_reselect_async, /* reselect_async */
default_fd_cancel_async /* cancel_async */
default_fd_reselect_async /* reselect_async */
};
static void named_pipe_dump( struct object *obj, int verbose )

3
server/request.c
View file

@ -119,8 +119,7 @@ static const struct fd_ops master_socket_fd_ops =
NULL, /* get_fd_type */
NULL, /* ioctl */
NULL, /* queue_async */
NULL, /* reselect_async */
NULL /* cancel_async */
NULL /* reselect_async */
};

3
server/serial.c
View file

@ -120,8 +120,7 @@ static const struct fd_ops serial_fd_ops =
no_fd_flush, /* flush */
default_fd_ioctl, /* ioctl */
serial_queue_async, /* queue_async */
serial_reselect_async, /* reselect_async */
default_fd_cancel_async /* cancel_async */
serial_reselect_async /* reselect_async */
};
/* check if the given fd is a serial port */

3
server/signal.c
View file

@ -91,8 +91,7 @@ static const struct fd_ops handler_fd_ops =
NULL, /* get_fd_type */
NULL, /* ioctl */
NULL, /* queue_async */
NULL, /* reselect_async */
NULL /* cancel_async */
NULL /* reselect_async */
};
static struct handler *handler_sighup;

6
server/sock.c
View file

@ -169,8 +169,7 @@ static const struct fd_ops sock_fd_ops =
no_fd_flush, /* flush */
sock_ioctl, /* ioctl */
sock_queue_async, /* queue_async */
sock_reselect_async, /* reselect_async */
default_fd_cancel_async /* cancel_async */
sock_reselect_async /* reselect_async */
};
@ -1002,8 +1001,7 @@ static const struct fd_ops ifchange_fd_ops =
no_fd_flush, /* flush */
no_fd_ioctl, /* ioctl */
NULL, /* queue_async */
NULL, /* reselect_async */
NULL /* cancel_async */
NULL /* reselect_async */
};
static void ifchange_dump( struct object *obj, int verbose )

3
server/thread.c
View file

@ -163,8 +163,7 @@ static const struct fd_ops thread_fd_ops =
NULL, /* get_fd_type */
NULL, /* ioctl */
NULL, /* queue_async */
NULL, /* reselect_async */
NULL /* cancel_async */
NULL /* reselect_async */
};
static struct list thread_list = LIST_INIT(thread_list);