ubik: Introduce ugen_secproc_func

We currently specify the signature of the 'secproc' function callback
in multiple places. Consolidate them into a single typedef.

Change-Id: Ic785f47fc726bff6c37f7fd826f1e2626d006776
Reviewed-on: https://gerrit.openafs.org/13986
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>

diff --git a/src/ubik/ubik.p.h b/src/ubik/ubik.p.h
index 44b57c8..fe81862 100644 (file)
--- a/src/ubik/ubik.p.h
+++ b/src/ubik/ubik.p.h
@@ -608,6 +608,7 @@ extern int ubik_ParseServerList(int argc, char **argv, afs_uint32 *ahost,
 
 struct rx_securityClass;
 struct afsconf_dir;
+typedef int (*ugen_secproc_func)(struct rx_securityClass *, afs_int32);
 extern int ugen_ClientInitCell(struct afsconf_dir *dir,
                               struct afsconf_cell *info,
                               int secFlags,
@@ -621,15 +622,13 @@ extern int ugen_ClientInitServer(const char *confDir, char *cellName,
                                 afs_uint32 port);
 extern int ugen_ClientInitFlags(const char *confDir, char *cellName,
                                int secFlags, struct ubik_client **uclientp,
-                               int (*secproc) (struct rx_securityClass *,
-                                               afs_int32),
+                               ugen_secproc_func secproc,
                                int maxservers, char *serviceid,
                                int deadtime);
 extern afs_int32 ugen_ClientInit(int noAuthFlag, const char *confDir,
                                 char *cellName, afs_int32 sauth,
                                 struct ubik_client **uclientp,
-                                int (*secproc) (struct rx_securityClass *sc,
-                                                afs_int32 scIndex),
+                                ugen_secproc_func secproc,
                                 char *funcName,
                                 afs_int32 gen_rxkad_level,
                                 afs_int32 maxservers, char *serviceid,

diff --git a/src/ubik/uinit.c b/src/ubik/uinit.c
index 4082a3a..1467cfb 100644 (file)
--- a/src/ubik/uinit.c
+++ b/src/ubik/uinit.c
@@ -32,7 +32,7 @@
 static int
 internal_client_init(struct afsconf_dir *dir, struct afsconf_cell *info,
                     int secFlags, struct ubik_client **uclientp,
-                    int (*secproc) (struct rx_securityClass *, afs_int32),
+                    ugen_secproc_func secproc,
                     int maxservers, const char *serviceid, int deadtime,
                     afs_uint32 server, afs_uint32 port, afs_int32 usrvid)
 {
@@ -115,7 +115,7 @@ ugen_ClientInitCell(struct afsconf_dir *dir, struct afsconf_cell *info,
 static int
 internal_client_init_dir(const char *confDir, char *cellName, int secFlags,
                      struct ubik_client **uclientp,
-                     int (*secproc) (struct rx_securityClass *, afs_int32),
+                     ugen_secproc_func secproc,
                      afs_int32 maxservers, char *serviceid, afs_int32 deadtime,
                      afs_uint32 server, afs_uint32 port, afs_int32 usrvid)
 {
@@ -174,7 +174,7 @@ ugen_ClientInitServer(const char *confDir, char *cellName, int secFlags,
 int
 ugen_ClientInitFlags(const char *confDir, char *cellName, int secFlags,
                     struct ubik_client **uclientp,
-                    int (*secproc) (struct rx_securityClass *, afs_int32),
+                    ugen_secproc_func secproc,
                     int maxservers, char *serviceid, int deadtime)
 {
     return internal_client_init_dir(confDir, cellName, secFlags, uclientp,
@@ -188,7 +188,7 @@ ugen_ClientInitFlags(const char *confDir, char *cellName, int secFlags,
 afs_int32
 ugen_ClientInit(int noAuthFlag, const char *confDir, char *cellName, afs_int32 sauth,
               struct ubik_client **uclientp,
-              int (*secproc) (struct rx_securityClass *, afs_int32),
+              ugen_secproc_func secproc,
               char *funcName, afs_int32 gen_rxkad_level,
               afs_int32 maxservers, char *serviceid, afs_int32 deadtime,
               afs_uint32 server, afs_uint32 port, afs_int32 usrvid)

diff --git a/src/volser/volser.p.h b/src/volser/volser.p.h
index 6d7f129..79c331e 100644 (file)
--- a/src/volser/volser.p.h
+++ b/src/volser/volser.p.h
@@ -15,6 +15,7 @@
 #endif
 
 #include <afs/voldefs.h>
+#include <ubik.h>
 
 /* vflags, representing state of the volume */
 #define        VTDeleteOnSalvage       1       /* delete on next salvage */
@@ -183,8 +184,7 @@ extern afs_uint32 vsu_GetVolumeID(char *astring, struct ubik_client *acstruct, a
 extern int vsu_ExtractName(char rname[], char name[]);
 extern afs_int32 vsu_ClientInit(const char *confDir, char *cellName,
                                int secFlags,
-                               int (*secproc)(struct rx_securityClass *,
-                                              afs_int32),
+                               ugen_secproc_func secproc,
                                struct ubik_client **uclientp);
 enum vol_s2s_crypt {
     VS2SC_NEVER = 0,

diff --git a/src/volser/vsutils.c b/src/volser/vsutils.c
index 51b2465..eec694d 100644 (file)
--- a/src/volser/vsutils.c
+++ b/src/volser/vsutils.c
@@ -396,7 +396,7 @@ VLDB_IsSameAddrs(afs_uint32 serv1, afs_uint32 serv2, afs_int32 *errorp)
 */
 int
 vsu_ClientInit(const char *confDir, char *cellName, int secFlags,
-              int (*secproc)(struct rx_securityClass *, afs_int32),
+              ugen_secproc_func secproc,
               struct ubik_client **uclientp)
 {
     return ugen_ClientInitFlags(confDir, cellName, secFlags, uclientp,