* 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.

diff --git a/ChangeLog b/ChangeLog
index 3a0d0ff130499cd5502965e48489bc863e7103b9..bfeea8471689b8cd585ab400f9b0e01794d1ccf6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-20  Erez Zadok  <ezk@cs.sunysb.edu>
+
+       * 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  <ezk@cs.sunysb.edu>
 
        * minor new ports: i386-unknown-netbsdelf2.1,

diff --git a/conf/transp/transp_tli.c b/conf/transp/transp_tli.c
index 68c47008a9c8f9807db930931eaaf3351ee36627..4a3b16c1d5fe89dea801d82624ba01513fd54d00 100644 (file)
--- 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 a64048a71a63e26e5217b5bc63bc84e71335b226..5823ded616a25ddd005b8c2124729a891a71a7a9 100644 (file)
--- 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