From e5f5d2de1eafee969ea63e9fe9edab92a4552682 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Tue, 20 Dec 2005 19:59:55 +0000 Subject: [PATCH] * include/am_utils.h, conf/transp/transp_tli.c (amu_svc_register, register_autofs_service): use a consistent prototype for the dispatch function of the autofs service de/registration functions. --- ChangeLog | 6 ++++++ conf/transp/transp_tli.c | 6 ++++-- include/am_utils.h | 5 +++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a0d0ff..bfeea84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-12-20 Erez Zadok + + * include/am_utils.h, conf/transp/transp_tli.c (amu_svc_register, + register_autofs_service): use a consistent prototype for the + dispatch function of the autofs service de/registration functions. + 2005-12-03 Erez Zadok * minor new ports: i386-unknown-netbsdelf2.1, diff --git a/conf/transp/transp_tli.c b/conf/transp/transp_tli.c index 68c4700..4a3b16c 100644 --- a/conf/transp/transp_tli.c +++ b/conf/transp/transp_tli.c @@ -301,7 +301,8 @@ amu_svc_getcaller(SVCXPRT *xprt) */ int amu_svc_register(SVCXPRT *xprt, u_long prognum, u_long versnum, - void (*dispatch)(), u_long protocol, struct netconfig *ncp) + void (*dispatch)(struct svc_req *rqstp, SVCXPRT *xprt), + u_long protocol, struct netconfig *ncp) { /* on TLI: svc_reg returns 1 on success, 0 otherwise */ return svc_reg(xprt, prognum, versnum, dispatch, ncp); @@ -841,7 +842,8 @@ out: * Register the autofs service for amd */ int -register_autofs_service(char *autofs_conftype, void (*autofs_dispatch)()) +register_autofs_service(char *autofs_conftype, + void (*autofs_dispatch)(struct svc_req *rqstp, SVCXPRT *xprt)) { struct t_bind *tbp = NULL; struct netconfig *autofs_ncp; diff --git a/include/am_utils.h b/include/am_utils.h index a64048a..5823ded 100644 --- a/include/am_utils.h +++ b/include/am_utils.h @@ -380,12 +380,13 @@ extern int get_knetconfig(struct knetconfig **kncpp, struct netconfig *in_ncp, c extern struct netconfig *nfsncp; extern void free_knetconfig(struct knetconfig *kncp); +#endif /* HAVE_TRANSPORT_TYPE_TLI */ + #ifdef HAVE_FS_AUTOFS -extern int register_autofs_service(char *autofs_conftype, void (*autofs_dispatch)(struct svc_req *, SVCXPRT *)); +extern int register_autofs_service(char *autofs_conftype, void (*autofs_dispatch)(struct svc_req *rqstp, SVCXPRT *xprt)); extern int unregister_autofs_service(char *autofs_conftype); #endif /* HAVE_FS_AUTOFS */ -#endif /* HAVE_TRANSPORT_TYPE_TLI */ #ifndef HAVE_STRUCT_FHSTATUS_FHS_FH # define fhs_fh fhstatus_u.fhs_fhandle -- 2.43.0