From 830f91f16e502384df3da8b41623aa28b83bcac8 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Wed, 31 Oct 2007 22:31:57 +0000
Subject: [PATCH] DEVEL15-more-anonymous-pointer-cleanup-20071031

more char*->void* conversion


(cherry picked from commit 8214014855be3fb99c00c23400a2a3325b2b4a57)
---
 src/afs/UKERNEL/afs_usrops.c | 9 +++------
 src/afsd/afsd.c              | 6 +++---
 src/auth/cellconfig.c        | 8 ++++----
 src/auth/cellconfig.p.h      | 8 ++++----
 src/auth/test/testcellconf.c | 8 +++-----
 5 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/afs/UKERNEL/afs_usrops.c b/src/afs/UKERNEL/afs_usrops.c
index 74dcbca08..e56ccc82f 100644
--- a/src/afs/UKERNEL/afs_usrops.c
+++ b/src/afs/UKERNEL/afs_usrops.c
@@ -1389,8 +1389,8 @@ SweepAFSCache(int *vFilesFound)
     return (0);
 }
 
-static
-ConfigCell(register struct afsconf_cell *aci, char *arock,
+static int
+ConfigCell(register struct afsconf_cell *aci, void *arock,
 	   struct afsconf_dir *adir)
 {
     register int isHomeCell;
@@ -1420,10 +1420,7 @@ ConfigCell(register struct afsconf_cell *aci, char *arock,
 }
 
 static int
-ConfigCellAlias(aca, arock, adir)
-	struct afsconf_cellalias *aca;
-	char *arock;
-	struct afsconf_dir *adir;
+ConfigCellAlias(struct afsconf_cellalias *aca, void *arock, struct afsconf_dir *adir)
 {
 	call_syscall(AFSOP_ADDCELLALIAS, (long)aca->aliasName, 
 		     (long)aca->realName, 0, 0, 0);
diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c
index 7a7699a02..0b08fdc1e 100644
--- a/src/afsd/afsd.c
+++ b/src/afsd/afsd.c
@@ -1391,8 +1391,8 @@ SweepAFSCache(vFilesFound)
     return doSweepAFSCache(vFilesFound, cacheBaseDir, -2, maxDir);
 }
 
-static
-ConfigCell(struct afsconf_cell *aci, char *arock, struct afsconf_dir *adir)
+static int
+ConfigCell(struct afsconf_cell *aci, void *arock, struct afsconf_dir *adir)
 {
     int isHomeCell;
     int i, code;
@@ -1424,7 +1424,7 @@ ConfigCell(struct afsconf_cell *aci, char *arock, struct afsconf_dir *adir)
 
 static
 ConfigCellAlias(struct afsconf_cellalias *aca,
-		char *arock, struct afsconf_dir *adir)
+		void *arock, struct afsconf_dir *adir)
 {
     /* push the alias into the kernel */
     call_syscall(AFSOP_ADDCELLALIAS, aca->aliasName, aca->realName);
diff --git a/src/auth/cellconfig.c b/src/auth/cellconfig.c
index 37c5f0304..5c789c536 100644
--- a/src/auth/cellconfig.c
+++ b/src/auth/cellconfig.c
@@ -775,8 +775,8 @@ ParseCellLine(register char *aline, register char *aname,
 /* call aproc(entry, arock, adir) for all cells.  Proc must return 0, or we'll stop early and return the code it returns */
 int
 afsconf_CellApply(struct afsconf_dir *adir,
-		  int (*aproc) (struct afsconf_cell * cell, char *arock,
-				struct afsconf_dir * dir), char *arock)
+		  int (*aproc) (struct afsconf_cell * cell, void *arock,
+				struct afsconf_dir * dir), void *arock)
 {
     register struct afsconf_entry *tde;
     register afs_int32 code;
@@ -798,8 +798,8 @@ afsconf_CellApply(struct afsconf_dir *adir,
 int
 afsconf_CellAliasApply(struct afsconf_dir *adir,
 		       int (*aproc) (struct afsconf_cellalias * alias,
-				     char *arock, struct afsconf_dir * dir),
-		       char *arock)
+				     void *arock, struct afsconf_dir * dir),
+		       void *arock)
 {
     register struct afsconf_aliasentry *tde;
     register afs_int32 code;
diff --git a/src/auth/cellconfig.p.h b/src/auth/cellconfig.p.h
index e2ae6ed2d..4a1bf0d5c 100644
--- a/src/auth/cellconfig.p.h
+++ b/src/auth/cellconfig.p.h
@@ -101,14 +101,14 @@ struct afsconf_servPair {
 extern struct afsconf_dir *afsconf_Open(register const char *adir);
 extern int afsconf_CellApply(struct afsconf_dir *adir,
 			     int (*aproc) (struct afsconf_cell * cell,
-					   char *arock,
+					   void *arock,
 					   struct afsconf_dir * dir),
-			     char *arock);
+			     void *arock);
 extern int afsconf_CellAliasApply(struct afsconf_dir *adir,
 				  int (*aproc) (struct afsconf_cellalias *
-						alias, char *arock,
+						alias, void *arock,
 						struct afsconf_dir * dir),
-				  char *arock);
+				  void *arock);
 extern int afsconf_GetExtendedCellInfo(struct afsconf_dir *adir,
 				       char *acellName, char *aservice,
 				       struct afsconf_cell *acellInfo,
diff --git a/src/auth/test/testcellconf.c b/src/auth/test/testcellconf.c
index 4f8002615..1bc9cae60 100644
--- a/src/auth/test/testcellconf.c
+++ b/src/auth/test/testcellconf.c
@@ -40,10 +40,8 @@ RCSID
 #endif
 #include <afs/cellconfig.h>
 
-PrintOneCell(ainfo, arock, adir)
-     struct afsconf_cell *ainfo;
-     char *arock;
-     struct afsconf_dir *adir;
+int 
+PrintOneCell(struct afsconf_cell *ainfo, void *arock, struct afsconf_dir *adir)
 {
     register int i;
     long temp;
@@ -101,7 +99,7 @@ main(argc, argv)
 	    printf("failed to find afsprot service (%d)\n", code);
 	else {
 	    printf("AFSPROT service:\n");
-	    PrintOneCell(&theCell, (char *)NULL, theDir);
+	    PrintOneCell(&theCell, NULL, theDir);
 	}
 	code = afsconf_GetCellInfo(theDir, 0, "bozotheclown", &theCell);
 	if (code == 0)
-- 
2.39.5