dir-buffer-protos-20040123

take yet another stab at getting dir buffer prototypes right

diff --git a/src/afs/afs_buffer.c b/src/afs/afs_buffer.c
index f80b7196f2676705c1487ace16e55ad107cb5015..47a24d4d1a9512989f565c03aae5cb2de2bc85bc 100644 (file)
--- a/src/afs/afs_buffer.c
+++ b/src/afs/afs_buffer.c
@@ -149,7 +149,7 @@ DInit(int abuffers)
     return;
 }
 
-char *
+void *
 DRead(register afs_inode_t * fid, register int page)
 {
     /* Read a page from the disk. */
@@ -484,7 +484,7 @@ DFlush(void)
     MReleaseReadLock(&afs_bufferLock);
 }
 
-char *
+void *
 DNew(register afs_inode_t * fid, register int page)
 {
     /* Same as read, only do *not* even try to read the page, since it probably doesn't exist. */

diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index 5537e5287fdf6c4ff4ee922f3936922caeda0ab7..942c1c1779cc89e936458c026accca32b621c2d6 100644 (file)
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -31,12 +31,12 @@ extern void afs_FreeAllAxs(struct axscache **headp);
 
 /* afs_buffer.c */
 extern void DInit(int abuffers);
-extern char *DRead(register afs_inode_t * fid, register int page);
+extern void *DRead(register afs_inode_t * fid, register int page);
 extern void DRelease(register struct buffer *bp, int flag);
 extern int DVOffset(register void *ap);
 extern void DZap(afs_inode_t * fid);
 extern void DFlush(void);
-extern char *DNew(register afs_inode_t * fid, register int page);
+extern void *DNew(register afs_inode_t * fid, register int page);
 extern void shutdown_bufferpackage(void);
 
 /* afs_call.c */

diff --git a/src/dir/dir.c b/src/dir/dir.c
index 80cbe52f0225ef322c650af0823d73a6b615f78a..16be7844275424c31117ae73b771d2ebf45c407e 100644 (file)
--- a/src/dir/dir.c
+++ b/src/dir/dir.c
@@ -82,8 +82,10 @@ RCSID
 #include "netinet/in.h"
 #endif
 
-/* Irix needs this */
-struct DirEntry *DRead();
+/* afs_buffer.c */
+/* These are needed because afs_prototypes.h is not included here */
+extern void *DRead();
+extern void *DNew();
 
 #else /* !defined(UKERNEL) */
 #include "afs/stds.h"

diff --git a/src/dir/dir.h b/src/dir/dir.h
index fa5ecfcccc443569ae1b8aa373768d1adbafb73a..8b1a61852431443ed3bf9694b62e381661cef74a 100644 (file)
--- a/src/dir/dir.h
+++ b/src/dir/dir.h
@@ -78,6 +78,8 @@ struct DirPage1 {
 extern int DVOffset(void *ap);
 
 
+/* This is private to buffer.c */
+struct buffer;
 
 /* Prototypes */
 extern int NameBlobs(char *name);
@@ -99,7 +101,7 @@ extern struct DirEntry *GetBlob(void *dir, afs_int32 blobno);
 extern int DirHash(register char *string);
 
 extern int DStat(int *abuffers, int *acalls, int *aios);
-extern void DRelease(register struct buffer *bp, int flag);
+extern void DRelease();
 extern int DVOffset(register void *ap);
 extern int DFlushVolume(register afs_int32 vid);
 extern int DFlushEntry(register afs_int32 *fid);
@@ -108,7 +110,7 @@ extern int DFlushEntry(register afs_int32 *fid);
    in afs_prototypes.h */
 #ifndef KERNEL
 extern int DInit(int abuffers);
-extern void *DRead(register afs_int32 *fid, register int page);
+extern void *DRead();
 extern int DFlush();
 extern void *DNew(register afs_int32 *fid, register int page);
 extern void DZap(register afs_int32 *fid);