DEVEL15-bubasics-prototypes-20090316

LICENSE IPL10
FIXES 124237

prototype the bubasics directory
make the volser prototypes available for bubasics to use

(cherry picked from commit 14c3d5ed9179574692a0f7a5cc15d625083e3cf8)

diff --git a/src/bubasics/Makefile.in b/src/bubasics/Makefile.in
index 21b37680d5d14e276a3858c932dbbd1406cfc4b5..6fd4c81b44f99511a0839d6807905890c3016a19 100644 (file)
--- a/src/bubasics/Makefile.in
+++ b/src/bubasics/Makefile.in
@@ -34,16 +34,16 @@ butc.cs.c: butc.h
 butc.ss.c: butc.h
 
 bumon.xdr.c: bumon.xg
-       ${RXGEN} -c -o $@ ${srcdir}/bumon.xg
+       ${RXGEN} -A -c -o $@ ${srcdir}/bumon.xg
 
 bumon.ss.c: bumon.xg
-       ${RXGEN} -S -o $@ ${srcdir}/bumon.xg
+       ${RXGEN} -A -S -o $@ ${srcdir}/bumon.xg
 
 bumon.cs.c: bumon.xg
-       ${RXGEN} -C -o $@ ${srcdir}/bumon.xg
+       ${RXGEN} -A -C -o $@ ${srcdir}/bumon.xg
 
 bumon.h: bumon.xg
-       ${RXGEN} -h -o $@ ${srcdir}/bumon.xg
+       ${RXGEN} -A -h -o $@ ${srcdir}/bumon.xg
 
 bumon.xdr.c: bumon.h
 bumon.ss.c: bumon.h

diff --git a/src/bubasics/bubasics.h b/src/bubasics/bubasics.h
index 8fbd5949faec8c00df5865ccc695d1d04857e117..d647b49fd653341d505506f98fd4f0ac399e566d 100644 (file)
--- a/src/bubasics/bubasics.h
+++ b/src/bubasics/bubasics.h
@@ -162,9 +162,9 @@ typedef dlqlinkT *dlqlinkP;
        }
 
 /* function typing */
-extern dlqlinkP dlqFront();
-extern dlqlinkP dlqUnlinkb();
-extern dlqlinkP dlqUnlinkf();
+extern dlqlinkP dlqFront(dlqlinkP);
+extern dlqlinkP dlqUnlinkb(dlqlinkP);
+extern dlqlinkP dlqUnlinkf(dlqlinkP);
 
 /* -----------------------------
  * Status management

diff --git a/src/bubasics/butm.p.h b/src/bubasics/butm.p.h
index cd4475375a491b2345eddc63067de296ae62ac1b..1c202f43995f74f188c093250302bce3a71a5c35 100644 (file)
--- a/src/bubasics/butm.p.h
+++ b/src/bubasics/butm.p.h
@@ -24,24 +24,31 @@ struct blockMark {
 #define BUTM_HDRSIZE   ((5*sizeof(afs_int32)) + sizeof(int))   /* sizeof blockMark */
 #define        BUTM_BLKSIZE   (BUTM_BLOCKSIZE - BUTM_HDRSIZE)
 
+struct butm_tapeLabel;
+
 struct butm_tapeInfo {
     afs_int32 structVersion;
     struct {
-       afs_int32(*mount) ();
-       afs_int32(*dismount) ();
-       afs_int32(*create) ();
-       afs_int32(*readLabel) ();
-       afs_int32(*seek) ();
-       afs_int32(*seekEODump) ();
-       afs_int32(*readFileBegin) ();
-       afs_int32(*readFileData) ();
-       afs_int32(*readFileEnd) ();
-       afs_int32(*writeFileBegin) ();
-       afs_int32(*writeFileData) ();
-       afs_int32(*writeFileEnd) ();
-       afs_int32(*writeEOT) ();
-       afs_int32(*setSize) ();
-       afs_int32(*getSize) ();
+       afs_int32(*mount) (struct butm_tapeInfo *, char *);
+       afs_int32(*dismount) (struct butm_tapeInfo *);
+       afs_int32(*create) (struct butm_tapeInfo *, struct butm_tapeLabel *,
+                           afs_int32);
+       afs_int32(*readLabel) (struct butm_tapeInfo *, 
+                              struct butm_tapeLabel *,
+                              afs_int32);
+       afs_int32(*seek) (struct butm_tapeInfo *, afs_int32);
+       afs_int32(*seekEODump) (struct butm_tapeInfo *, afs_int32);
+       afs_int32(*readFileBegin) (struct butm_tapeInfo *);
+       afs_int32(*readFileData) (struct butm_tapeInfo *, char *, int len, 
+                                 int *);
+       afs_int32(*readFileEnd) (struct butm_tapeInfo *);
+       afs_int32(*writeFileBegin) (struct butm_tapeInfo *);
+       afs_int32(*writeFileData) (struct butm_tapeInfo *, char *, afs_int32,
+                                  afs_int32);
+       afs_int32(*writeFileEnd) (struct butm_tapeInfo *);
+       afs_int32(*writeEOT) (struct butm_tapeInfo *);
+       afs_int32(*setSize) (struct butm_tapeInfo *, afs_uint32);
+       afs_int32(*getSize) (struct butm_tapeInfo *, afs_uint32);
     } ops;
     char name[BU_MAXTAPELEN];
     afs_int32 position;                /* current position of tape */

diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in
index 7952b410e295849afe68b1e4f55300b55cd40f3d..2bfa088cc00529f10b77e75413a87034fc45c27c 100644 (file)
--- a/src/volser/Makefile.in
+++ b/src/volser/Makefile.in
@@ -56,6 +56,7 @@ SOBJS=volmain.o volprocs.o physio.o common.o voltrans.o volerr.o \
 
 all: volserver vos restorevol voldump \
        ${TOP_INCDIR}/afs/volser.h \
+       ${TOP_INCDIR}/afs/vsutils_prototypes.h \
        ${TOP_INCDIR}/afs/volint.h \
        ${TOP_LIBDIR}/libvolser.a
 
@@ -132,6 +133,9 @@ install: \
 ${DEST}/include/afs/volser.h: volser.h
        ${INSTALL} $? $@
 
+${DEST}/include/afs/vsutils_prototypes.h: vsutils_prototypes.h
+       ${INSTALL} $? $@
+
 ${DEST}/include/afs/volint.h: volint.h
        ${INSTALL} $? $@
 
@@ -182,6 +186,12 @@ ${DESTDIR}${includedir}/afs/volser.h: volser.h
 ${TOP_INCDIR}/afs/volser.h: volser.h
        ${INSTALL} $? $@
 
+${DESTDIR}${includedir}/afs/vsutils_prototypes.h: vsutils_prototypes.h
+       ${INSTALL} $? $@
+
+${TOP_INCDIR}/afs/vsutils_prototypes.h: vsutils_prototypes.h
+       ${INSTALL} $? $@
+
 ${DESTDIR}${includedir}/afs/volint.h: volint.h
        ${INSTALL} $? $@
 
@@ -218,6 +228,7 @@ dest: \
        ${DEST}/etc/restorevol \
        ${DEST}/etc/voldump \
        ${DEST}/include/afs/volser.h \
+       ${DEST}/include/afs/vsutils_prototypes.h \
        ${DEST}/include/afs/volint.h \
        ${DEST}/etc/vos \
        ${DEST}/root.server/usr/afs/bin/vos \