diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2013-11-30 17:18:01 +0100 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2013-12-02 17:31:14 +0100 |
| commit | ceb716e88f2ade9d9abe116fe8cddf34844d71e7 (patch) | |
| tree | 3b9fb31b147b22fede7b7ab63916a54d5593d8ed /libnetfs | |
| parent | bbf408117c40f2e02b9d3e23025c01b74f5bdc09 (diff) | |
libnetfs: improve the netfs_demuxer function
Handle multiple request types as recommended by the Mach Server
Writer's Guide section 4, subsection "Handling Multiple Request
Types". This avoids initializing the reply message in every X_server
function. The reply message has already been properly initialized in
libports, so there is no need to call mig_reply_setup.
* libnetfs/demuxer.c (netfs_demuxer): Improve the demuxer function.
Diffstat (limited to 'libnetfs')
| -rw-r--r-- | libnetfs/demuxer.c | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/libnetfs/demuxer.c b/libnetfs/demuxer.c index 8b6d1b2f..8ef4d86b 100644 --- a/libnetfs/demuxer.c +++ b/libnetfs/demuxer.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1996 Free Software Foundation, Inc. + Copyright (C) 1996, 2013 Free Software Foundation, Inc. Written by Michael I. Bushnell, p/BSG. This file is part of the GNU Hurd. @@ -24,15 +24,24 @@ int netfs_demuxer (mach_msg_header_t *inp, mach_msg_header_t *outp) { - int netfs_fs_server (mach_msg_header_t *, mach_msg_header_t *); - int netfs_io_server (mach_msg_header_t *, mach_msg_header_t *); - int netfs_fsys_server (mach_msg_header_t *, mach_msg_header_t *); - int netfs_ifsock_server (mach_msg_header_t *, mach_msg_header_t *); + mig_routine_t netfs_io_server_routine (mach_msg_header_t *); + mig_routine_t netfs_fs_server_routine (mach_msg_header_t *); + mig_routine_t ports_notify_server_routine (mach_msg_header_t *); + mig_routine_t netfs_fsys_server_routine (mach_msg_header_t *); + mig_routine_t ports_interrupt_server_routine (mach_msg_header_t *); + mig_routine_t netfs_ifsock_server_routine (mach_msg_header_t *); - return (netfs_io_server (inp, outp) - || netfs_fs_server (inp, outp) - || ports_notify_server (inp, outp) - || netfs_fsys_server (inp, outp) - || ports_interrupt_server (inp, outp) - || netfs_ifsock_server (inp, outp)); + mig_routine_t routine; + if ((routine = netfs_io_server_routine (inp)) || + (routine = netfs_fs_server_routine (inp)) || + (routine = ports_notify_server_routine (inp)) || + (routine = netfs_fsys_server_routine (inp)) || + (routine = ports_interrupt_server_routine (inp)) || + (routine = netfs_ifsock_server_routine (inp))) + { + (*routine) (inp, outp); + return TRUE; + } + else + return FALSE; } |