pull-prototypes-to-head-20020821

[openafs.git] / src / afs / DUX / osi_file.c

diff --git a/src/afs/DUX/osi_file.c b/src/afs/DUX/osi_file.c
index 918a4f0..b016a76 100644 (file)
--- a/src/afs/DUX/osi_file.c
+++ b/src/afs/DUX/osi_file.c
@@ -24,8 +24,7 @@ extern struct osi_dev cacheDev;
 extern struct mount *afs_cacheVfsp;
 
 
-void *osi_UFSOpen(ainode)
-    afs_int32 ainode;
+void *osi_UFSOpen(afs_int32 ainode)
 {
     static struct vnode *tags_vnode = NULL;
     struct inode *ip;
@@ -105,9 +104,8 @@ void *osi_UFSOpen(ainode)
     return afile;
 }
 
-afs_osi_Stat(afile, astat)
-    register struct osi_file *afile;
-    register struct osi_stat *astat; {
+int afs_osi_Stat(register struct osi_file *afile, register struct osi_stat *astat)
+{
     register afs_int32 code;
     struct vattr tvattr;
     AFS_STATCNT(osi_Stat);
@@ -125,9 +123,8 @@ afs_osi_Stat(afile, astat)
     return code;
 }
 
-osi_UFSClose(afile)
-     register struct osi_file *afile;
-  {
+int osi_UFSClose(register struct osi_file *afile)
+{
       AFS_STATCNT(osi_Close);
       if(afile->vnode) {
        AFS_RELE(afile->vnode);
@@ -135,11 +132,10 @@ osi_UFSClose(afile)
       
       osi_FreeSmallSpace(afile);
       return 0;
-  }
+}
 
-osi_UFSTruncate(afile, asize)
-    register struct osi_file *afile;
-    afs_int32 asize; {
+int osi_UFSTruncate(register struct osi_file *afile, afs_int32 asize)
+{
     struct AFS_UCRED *oldCred;
     struct vattr tvattr;
     register afs_int32 code;
@@ -168,8 +164,7 @@ osi_UFSTruncate(afile, asize)
     return code;
 }
 
-void osi_DisableAtimes(avp)
-struct vnode *avp;
+void osi_DisableAtimes(struct vnode *avp)
 {
    struct inode *ip;
    assert(avp->v_tag == VT_UFS);
@@ -179,11 +174,8 @@ struct vnode *avp;
 
 
 /* Generic read interface */
-afs_osi_Read(afile, offset, aptr, asize)
-    register struct osi_file *afile;
-    int offset;
-    char *aptr;
-    afs_int32 asize; {
+int afs_osi_Read(register struct osi_file *afile, int offset, void *aptr, afs_int32 asize)
+{
     struct AFS_UCRED *oldCred;
     unsigned int resid;
     register afs_int32 code;
@@ -220,11 +212,8 @@ afs_osi_Read(afile, offset, aptr, asize)
 }
 
 /* Generic write interface */
-afs_osi_Write(afile, offset, aptr, asize)
-    register struct osi_file *afile;
-    char *aptr;
-    afs_int32 offset;
-    afs_int32 asize; {
+int afs_osi_Write(register struct osi_file *afile, afs_int32 offset, void *aptr, afs_int32 asize)
+{
     struct AFS_UCRED *oldCred;
     unsigned int resid;
     register afs_int32 code;
@@ -258,9 +247,7 @@ afs_osi_Write(afile, offset, aptr, asize)
 /*  This work should be handled by physstrat in ca/machdep.c.
     This routine written from the RT NFS port strategy routine.
     It has been generalized a bit, but should still be pretty clear. */
-int afs_osi_MapStrategy(aproc, bp)
-       int (*aproc)();
-       register struct buf *bp;
+int afs_osi_MapStrategy(int (*aproc)(), register struct buf *bp)
 {
     afs_int32 returnCode;
 
@@ -272,8 +259,7 @@ int afs_osi_MapStrategy(aproc, bp)
 
 
 
-void
-shutdown_osifile()
+void shutdown_osifile(void)
 {
   extern int afs_cold_shutdown;