summaryrefslogtreecommitdiff
path: root/trans
diff options
context:
space:
mode:
Diffstat (limited to 'trans')
-rw-r--r--trans/proxy-defpager.c14
-rw-r--r--trans/streamio.c15
2 files changed, 21 insertions, 8 deletions
diff --git a/trans/proxy-defpager.c b/trans/proxy-defpager.c
index 662f2698..4fdeb35b 100644
--- a/trans/proxy-defpager.c
+++ b/trans/proxy-defpager.c
@@ -236,10 +236,16 @@ int
proxy_defpager_demuxer (mach_msg_header_t *inp,
mach_msg_header_t *outp)
{
- extern int default_pager_server (mach_msg_header_t *, mach_msg_header_t *);
-
- return default_pager_server (inp, outp)
- || trivfs_demuxer (inp, outp);
+ mig_routine_t routine;
+ if ((routine = default_pager_server_routine (inp)) ||
+ (routine = NULL, trivfs_demuxer (inp, outp)))
+ {
+ if (routine)
+ (*routine) (inp, outp);
+ return TRUE;
+ }
+ else
+ return FALSE;
}
int
diff --git a/trans/streamio.c b/trans/streamio.c
index 54627b73..507250bd 100644
--- a/trans/streamio.c
+++ b/trans/streamio.c
@@ -36,6 +36,7 @@
#include "libtrivfs/trivfs_fs_S.h"
#include "libtrivfs/trivfs_io_S.h"
+#include "device_reply_S.h"
/* The global lock */
pthread_mutex_t global_lock;
@@ -273,10 +274,16 @@ static const struct argp argp = { options, parse_opt, args_doc, doc };
int
demuxer (mach_msg_header_t *inp, mach_msg_header_t *outp)
{
- extern int device_reply_server (mach_msg_header_t *, mach_msg_header_t *);
-
- return (trivfs_demuxer (inp, outp)
- || device_reply_server (inp, outp));
+ mig_routine_t routine;
+ if ((routine = NULL, trivfs_demuxer (inp, outp)) ||
+ (routine = device_reply_server_routine (inp)))
+ {
+ if (routine)
+ (*routine) (inp, outp);
+ return TRUE;
+ }
+ else
+ return FALSE;
}
int