Add public protoypes for volser

Add a new public header file volser_prototypes.h, which contains
prototypes for those volser functions that are used by the rest of the
tree, and link it into the Unix and Windows build systems.

Rename the current volser_prototypes.h volser_internal.h, and update
references to it.

Make those places that should use the new public header use it, and
re-enable warnings-as-errors as appropriate.

Remove the warning free files from the list in README.WARNINGS

Add butm_prototypes.h to butc/lwps.c, so we can enable warnings for that,
too.

Reviewed-on: http://gerrit.openafs.org/636
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/README.WARNINGS b/README.WARNINGS
index 60b2114eb4ddac1122fe6f455084ae33f37982b9..aa6c452e8fca027c80e0a64a5cb6d3ff74c50db4 100644 (file)
--- a/README.WARNINGS
+++ b/README.WARNINGS
@@ -51,19 +51,15 @@ bozo/bos.c           : all           : DES key types & string consts
 bozo/bos_util.c      : all           : DES key types
 bubasics/bumon.ss.c  : all          : BC_Print collision betwen client & server
 bucoord/ubik_db_if.c : strict-proto  : Ubik_Call
-                    : all           : Public version of volser_prototypes req
-bucoord/volstub.c    : all           : Public version of volser_prototypes req
 bucoord/commands.c   : all          : Ubik_Call
                                     : signed vs unsigned for dates
 budb/server.c        : all          : ExtendedCellInfo
-butc/lwps.c          : all           : Public version of volser_prototypes req
 butc/tcmain.c       : all           : prototypes / signed warnings (XXX)
 butc/recoverDb.c     : all          : pointer target issues (XXX)
 butc/tcudbprocs.c    : all          : ubik_Call
 butc/dump.c         : all           : pointer types (XXX)
 comerr/error_table.c : all           : Autogenerated file with unused labels
 fsint/afsint.xdr.c   : all           : rxgen opaque vectors problem
-fsprobe/fsprobe.c    : all          : Public version of volser_prototypes req
 kauth/kaprocs.c             : all           : XXX
 kauth/kaserver.c     : all          : ExtendedCellInfo
 kauth/krb_udp.c      : all           : XXX
@@ -90,8 +86,7 @@ ubik/beacon.c        : all           : Ubik uses signed/unsigned
                                       interchangably for IP addresses, a 
                                       fix will require API changes.
 ubik/ubikclient.c    : strict-protos : ubik_Call
-uss/uss_vol.c       : all           : Public version of volser_prototypes req
-                                      Format issues
+uss/uss_vol.c       : all             Format issues
 uss/uss_kauth.c      : all          : Des keys, ubik_Call
 uss/lex.yy.c         : all           : Unused symbols
 viced/fsprobe.c      : all          : ubik_Call

diff --git a/src/bucoord/Makefile.in b/src/bucoord/Makefile.in
index ad000c971d0a37eb16b9513dce5901f9975faef6..76ab7905694628743d464e65ce353189582a9b60 100644 (file)
--- a/src/bucoord/Makefile.in
+++ b/src/bucoord/Makefile.in
@@ -72,10 +72,10 @@ bucoord_errs.c bc.h:        bucoord_errs.et bc.p.h
 # Errors
 #
 ubik_db_if.o: ubik_db_if.c
-       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $<
+       $(CC) $(CFLAGS) -c $<
 
 volstub.o: volstub.c
-       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $<
+       $(CC) $(CFLAGS) -c $<
 
 commands.o: commands.c
        $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $<

diff --git a/src/bucoord/ubik_db_if.c b/src/bucoord/ubik_db_if.c
index 0338c2cbe625ce5e73c4612d55d3716c1f31eaf7..2dc31e1d01943f45176b285a2f551ba082529c6e 100644 (file)
--- a/src/bucoord/ubik_db_if.c
+++ b/src/bucoord/ubik_db_if.c
@@ -29,6 +29,7 @@
 #include <afs/cellconfig.h>
 #include <ubik.h>
 #include <afs/volser.h>
+#include <afs/volser_prototypes.h>
 #include <afs/afsutil.h>
 #include <afs/bubasics.h>
 #include <afs/budb_client.h>

diff --git a/src/bucoord/volstub.c b/src/bucoord/volstub.c
index 3dcbdc123ce4cea2f4fd3314049a1396425d9d08..7efbca5a86710001f1236a2b1c7f7c19f267087b 100644 (file)
--- a/src/bucoord/volstub.c
+++ b/src/bucoord/volstub.c
@@ -25,6 +25,8 @@
 #include "volser.h"
 #include "bc.h"
 #include <afs/volint.h>
+#include <afs/volser.h>
+#include <afs/volser_prototypes.h>
 #include <afs/com_err.h>
 
 extern char *whoami;

diff --git a/src/butc/Makefile.in b/src/butc/Makefile.in
index bb0f44d4eddc681202f624398ab91834fa571271..4ede693b5351021b3de31e05a6dddbe1dc997557 100644 (file)
--- a/src/butc/Makefile.in
+++ b/src/butc/Makefile.in
@@ -73,7 +73,7 @@ dbentries.o: dbentries.c ${INCLS}
 tcprocs.o: tcprocs.c ${INCLS}
 test.o: test.c ${INCLS} AFS_component_version_number.c
 lwps.o: lwps.c ${INCLS}
-       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $<
+       $(CC) $(CFLAGS) -c $<
 list.o: list.c ${INCLS}
 recoverDb.o: recoverDb.c ${INCLS}
        $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $<

diff --git a/src/butc/lwps.c b/src/butc/lwps.c
index c3fd547ec9e0dca2d5d9c8a57b6468046325557c..2e540ce3c7c189b9dc9b25ddb5be587485ee85d2 100644 (file)
--- a/src/butc/lwps.c
+++ b/src/butc/lwps.c
@@ -32,7 +32,9 @@
 #include <afs/bubasics.h>      /* PA */
 #include <afs/budb_client.h>
 #include <afs/bucoord_prototypes.h>
+#include <afs/butm_prototypes.h>
 #include <afs/volser.h>
+#include <afs/volser_prototypes.h>
 #include <afs/com_err.h>
 #include "error_macros.h"
 #include <afs/afsutil.h>
@@ -1100,10 +1102,11 @@ GetRestoreTape(afs_int32 taskId, struct butm_tapeInfo *tapeInfoPtr,
 }
 
 afs_int32
-xbsaRestoreVolumeData(struct rx_call *call, struct restoreParams *rparamsPtr)
+xbsaRestoreVolumeData(struct rx_call *call, void *rock)
 {
     afs_int32 code = 0;
 #ifdef xbsa
+    struct restoreParams *rparamsPtr = (struct restoreParams *)rock;
     afs_int32 curChunk, rc;
     afs_uint32 totalWritten;
     afs_int32 headBytes, tailBytes, w;
@@ -1251,8 +1254,9 @@ xbsaRestoreVolumeData(struct rx_call *call, struct restoreParams *rparamsPtr)
  */
 
 afs_int32
-restoreVolumeData(struct rx_call *call, struct restoreParams *rparamsPtr)
+restoreVolumeData(struct rx_call *call, void *rock)
 {
+    struct restoreParams *rparamsPtr = (struct restoreParams *)rock;
     afs_int32 curChunk;
     afs_uint32 totalWritten = 0;
     afs_int32 code = 0;

diff --git a/src/fsprobe/fsprobe.c b/src/fsprobe/fsprobe.c
index 9ec0b537a0695c3dbf10db27b0021e834964ab32..2272f38308a4ff69dc7945b7d8f9de899a6414f2 100644 (file)
--- a/src/fsprobe/fsprobe.c
+++ b/src/fsprobe/fsprobe.c
@@ -25,6 +25,8 @@
 #include <afs/cellconfig.h>
 #include <afs/afsint.h>
 #include <afs/afsutil.h>
+#include <afs/volser.h>
+#include <afs/volser_prototypes.h>
 
 #define FSINT_COMMON_XG
 #include <afs/afscbint.h>

diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in
index cde070334a2e210bcc53143f56727d8ad7c95944..f9d7167a309274c94303b4d5e43120a97aa54f62 100644 (file)
--- a/src/volser/Makefile.in
+++ b/src/volser/Makefile.in
@@ -21,7 +21,7 @@ RINCLS=${TOP_INCDIR}/rx/rx.h ${TOP_INCDIR}/rx/xdr.h \
        ${TOP_INCDIR}/afs/keys.h ${TOP_INCDIR}/afs/cellconfig.h \
        ${TOP_INCDIR}/ubik.h ${TOP_INCDIR}/afs/cmd.h
 
-INTINCLS=volint.h volser.h 
+INTINCLS=volint.h volser.h volser_prototypes.h volser_internal.h
 
 LIBS=\
        ${TOP_LIBDIR}/libaudit.a \
@@ -61,12 +61,16 @@ 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/volser_prototypes.h \
        ${TOP_INCDIR}/afs/volint.h \
        ${TOP_LIBDIR}/libvolser.a
 
 ${TOP_INCDIR}/afs/vsutils_prototypes.h: vsutils_prototypes.h
        ${INSTALL_DATA} $? $@
 
+${TOP_INCDIR}/afs/volser_prototypes.h: volser_prototypes.h
+       ${INSTALL_DATA} $? $@
+
 ${TOP_INCDIR}/afs/volser.h: volser.h
        ${INSTALL_DATA} $? $@
 

diff --git a/src/volser/NTMakefile b/src/volser/NTMakefile
index 2cc6ca70d9c069c6641732db6b85c3970ca38869..08090b898b18f8741dda04d0e2e04a51957c458b 100644 (file)
--- a/src/volser/NTMakefile
+++ b/src/volser/NTMakefile
@@ -19,6 +19,7 @@ INCFILEDIR = $(DESTDIR)\include\afs  # header file install directory
 INCFILES = \
        $(INCFILEDIR)\volser_prototypes.h \
        $(INCFILEDIR)\vsutils_prototypes.h \
+       $(INCFILEDIR)\volser_prototypes.h \
        $(INCFILEDIR)\lockprocs_prototypes.h \
        $(INCFILEDIR)\volser.h \
        $(INCFILEDIR)\volint.h

diff --git a/src/volser/vol_split.c b/src/volser/vol_split.c
index b4c84e344b9d9159eabf8723c28a773317c4119a..0c2c2417886ba004d1b32c3243d524b467a4bfd8 100644 (file)
--- a/src/volser/vol_split.c
+++ b/src/volser/vol_split.c
@@ -53,7 +53,7 @@
 #include "volint.h"
 #include "volser.h"
 #include "physio.h"
-#include "volser_prototypes.h"
+#include "volser_internal.h"
 #ifdef AFS_RXOSD_SUPPORT
 #include "rxosd.h"
 #include "vol_osd.h"

diff --git a/src/volser/volmain.c b/src/volser/volmain.c
index 28dafd6a897680e20c7fff1e864d81e49ce9abbb..fb28bb5512fb6243b661e4ed624c8c0304e5a38e 100644 (file)
--- a/src/volser/volmain.c
+++ b/src/volser/volmain.c
@@ -63,7 +63,7 @@
 #include <lwp.h>
 #include "volser.h"
 #include "volint.h"
-#include "volser_prototypes.h"
+#include "volser_internal.h"
 
 /*@printflike@*/ extern void Log(const char *format, ...);
 /*@printflike@*/ extern void Abort(const char *format, ...);

diff --git a/src/volser/volprocs.c b/src/volser/volprocs.c
index 4e6b588af7f9055a3777f1a5e485e5c1e1a792d8..233efecf54ea6a5234f8f3b762bd6464ba2a129c 100644 (file)
--- a/src/volser/volprocs.c
+++ b/src/volser/volprocs.c
@@ -66,7 +66,7 @@
 #include "volser.h"
 #include "volint.h"
 
-#include "volser_prototypes.h"
+#include "volser_internal.h"
 #include "physio.h"
 #include "dumpstuff.h"
 

diff --git a/src/volser/volser_internal.h b/src/volser/volser_internal.h
new file mode 100644 (file)
index 0000000..d158039
--- /dev/null
+++ b/src/volser/volser_internal.h
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+#ifndef        AFS_SRC_VOLSER_INTERNAL_H
+#define AFS_SRC_VOLSER_INTERNAL_H
+
+/* common.c */
+extern void Log(const char *, ...);
+extern void InitErrTabs(void);
+
+/* vol_split.c */
+extern afs_int32 split_volume(struct rx_call *, Volume *, Volume *,
+                             afs_uint32, afs_int32);
+
+/* voltrans.c */
+extern struct volser_trans *FindTrans(afs_int32);
+extern struct volser_trans *NewTrans(afs_int32, afs_int32);
+extern struct volser_trans *TransList(void);
+extern afs_int32 DeleteTrans(struct volser_trans *atrans, afs_int32 lock);
+extern afs_int32 TRELE (struct volser_trans *);
+
+/* volprocs.c */
+extern int VPFullUnlock(void);
+
+/* voltrans.c */
+extern afs_int32 GCTrans(void);
+
+/* vsprocs.c */
+struct nvldbentry;
+extern int yesprompt(char *str);
+extern int PrintError(char *msg, afs_int32 errcode);
+extern void init_volintInfo(struct volintInfo *vinfo);
+extern struct rx_connection *UV_Bind(afs_int32 aserver, afs_int32 port);
+extern void SubEnumerateEntry(struct nvldbentry *entry);
+extern void EnumerateEntry(struct nvldbentry *entry);
+extern int UV_NukeVolume(afs_int32 server, afs_int32 partid, afs_uint32 volid);
+extern int UV_PartitionInfo64(afs_int32 server, char *pname,
+                           struct diskPartition64 *partition);
+extern int UV_CreateVolume2(afs_int32 aserver, afs_int32 apart, char *aname,
+                           afs_int32 aquota, afs_int32 aspare1,
+                           afs_int32 aspare2, afs_int32 aspare3,
+                           afs_int32 aspare4, afs_uint32 * anewid);
+extern int UV_CreateVolume3(afs_int32 aserver, afs_int32 apart, char *aname,
+                           afs_int32 aquota, afs_int32 aspare1,
+                           afs_int32 aspare2, afs_int32 aspare3,
+                           afs_int32 aspare4, afs_uint32 * anewid,
+                           afs_uint32 * aroid, afs_uint32 * abkid);
+extern int UV_AddVLDBEntry(afs_int32 aserver, afs_int32 apart, char *aname,
+                          afs_uint32 aid);
+extern void sigint_handler(int x);
+extern int UV_MoveVolume(afs_uint32 afromvol, afs_int32 afromserver,
+                        afs_int32 afrompart, afs_int32 atoserver,
+                        afs_int32 atopart);
+extern int UV_MoveVolume2(afs_uint32 afromvol, afs_int32 afromserver, 
+                          afs_int32 afrompart, afs_int32 atoserver, 
+                          afs_int32 atopart, int flags);
+extern int UV_BackupVolume(afs_int32 aserver, afs_int32 apart,
+                          afs_uint32 avolid);
+extern int UV_ReleaseVolume(afs_uint32 afromvol, afs_int32 afromserver,
+                           afs_int32 afrompart, int forceflag);
+extern void dump_sig_handler(int x);
+extern int UV_DumpVolume(afs_uint32 afromvol, afs_int32 afromserver,
+                        afs_int32 afrompart, afs_int32 fromdate,
+                        afs_int32(*DumpFunction) (struct rx_call *, void *),
+                        void *rock, afs_int32 flags);
+extern int UV_RestoreVolume2(afs_int32 toserver, afs_int32 topart,
+                            afs_uint32 tovolid, afs_int32 toparentid,
+                            char tovolname[], int flags,
+                             afs_int32(*WriteData) (struct rx_call *, void *),
+                            void *rock);
+extern int UV_LockRelease(afs_uint32 volid);
+extern int UV_AddSite(afs_int32 server, afs_int32 part, afs_uint32 volid,
+                     afs_int32 valid);
+extern int UV_AddSite2(afs_int32 server, afs_int32 part, afs_uint32 volid,
+                      afs_uint32 rovolid, afs_int32 valid);
+extern int UV_RemoveSite(afs_int32 server, afs_int32 part, afs_uint32 volid);
+extern int UV_ChangeLocation(afs_int32 server, afs_int32 part,
+                            afs_uint32 volid);
+extern int UV_ListPartitions(afs_int32 aserver, struct partList *ptrPartList,
+                            afs_int32 * cntp);
+extern int UV_ZapVolumeClones(afs_int32 aserver, afs_int32 apart,
+                             struct volDescription *volPtr,
+                             afs_int32 arraySize);
+extern int UV_GenerateVolumeClones(afs_int32 aserver, afs_int32 apart,
+                                  struct volDescription *volPtr,
+                                  afs_int32 arraySize);
+extern int UV_ListVolumes(afs_int32 aserver, afs_int32 apart, int all,
+                         struct volintInfo **resultPtr, afs_int32 * size);
+extern int UV_XListVolumes(afs_int32 a_serverID, afs_int32 a_partID,
+                          int a_all, struct volintXInfo **a_resultPP,
+                          afs_int32 * a_numEntsInResultP);
+extern int UV_XListOneVolume(afs_int32 a_serverID, afs_int32 a_partID,
+                            afs_uint32 a_volID,
+                            struct volintXInfo **a_resultPP);
+extern int sortVolumes(const void *a, const void *b);
+extern int UV_SyncVolume(afs_int32 aserver, afs_int32 apart, char *avolname,
+                        int flags);
+extern int UV_SyncVldb(afs_int32 aserver, afs_int32 apart, int flags,
+                      int force);
+extern afs_int32 VolumeExists(afs_int32 server, afs_int32 partition,
+                             afs_uint32 volumeid);
+extern afs_int32 CheckVldbRWBK(struct nvldbentry *entry,
+                              afs_int32 * modified);
+extern int CheckVldbRO(struct nvldbentry *entry, afs_int32 * modified);
+extern afs_int32 CheckVldb(struct nvldbentry *entry, afs_int32 * modified);
+extern int UV_SyncServer(afs_int32 aserver, afs_int32 apart, int flags,
+                        int force);
+extern int UV_RenameVolume(struct nvldbentry *entry, char oldname[],
+                          char newname[]);
+extern int UV_VolserStatus(afs_int32 server, transDebugInfo ** rpntr,
+                          afs_int32 * rcount);
+extern int UV_VolumeZap(afs_int32 server, afs_int32 part, afs_uint32 volid);
+extern int UV_SetVolume(afs_int32 server, afs_int32 partition,
+                       afs_uint32 volid, afs_int32 transflag,
+                       afs_int32 setflag, int sleeptime);
+extern int UV_SetVolumeInfo(afs_int32 server, afs_int32 partition,
+                           afs_uint32 volid, volintInfo * infop);
+extern void MapNetworkToHost(struct nvldbentry *old, struct nvldbentry *new);
+extern int UV_CopyVolume2(afs_uint32 afromvol, afs_int32 afromserver, 
+                          afs_int32 afrompart, char *atovolname, 
+                          afs_int32 atoserver, afs_int32 atopart,
+                          afs_uint32 atovolid, int flags);
+extern int UV_CloneVolume(afs_int32 aserver, afs_int32 apart, afs_uint32 avolid,
+                          afs_uint32 acloneid, char *aname, int flags);
+extern int UV_DumpClonedVolume(afs_uint32 afromvol, afs_int32 afromserver,
+                               afs_int32 afrompart, afs_int32 fromdate,
+                               afs_int32(*DumpFunction)
+                                         (struct rx_call *, void *),
+                              void *rock, afs_int32 flags);
+extern int UV_GetSize(afs_uint32 afromvol, afs_int32 afromserver, 
+                      afs_int32 afrompart, afs_int32 fromdate, 
+                      struct volintSize *vol_size);
+
+extern int verbose;
+extern int noresolve;
+#endif

diff --git a/src/volser/volser_prototypes.h b/src/volser/volser_prototypes.h
index 6372bb8bf7a8bd36c424c45bddd91484f5dc42a8..63c130fb20a6e9d3cb64183975e39ed215930e14 100644 (file)
--- a/src/volser/volser_prototypes.h
+++ b/src/volser/volser_prototypes.h
@@ -7,151 +7,32 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#ifndef        _VOLSER_PROTOTYPES_H
-#define _VOLSER_PROTOTYPES_H
+#ifndef        AFS_SRC_VOLSER_PROTOTYPES_H
+#define AFS_SRC_VOLSER_PROTOTYPES_H
 
-/* common.c */
-extern void Log(const char *, ...);
-extern void InitErrTabs(void);
-
-/* vol_split.c */
-extern afs_int32 split_volume(struct rx_call *, Volume *, Volume *,
-                             afs_uint32, afs_int32);
-
-/* voltrans.c */
-extern struct volser_trans *FindTrans(afs_int32);
-extern struct volser_trans *NewTrans(afs_int32, afs_int32);
-extern struct volser_trans *TransList(void);
-extern afs_int32 DeleteTrans(struct volser_trans *atrans, afs_int32 lock);
-extern afs_int32 TRELE (struct volser_trans *);
-
-/* volprocs.c */
-extern int VPFullUnlock(void);
-
-/* voltrans.c */
-extern afs_int32 GCTrans(void);
+struct nvldbentry;
+struct volintInfo;
 
 /* vsprocs.c */
-struct nvldbentry;
 extern void MapPartIdIntoName(afs_int32 partId, char *partName);
-extern int yesprompt(char *str);
-extern int PrintError(char *msg, afs_int32 errcode);
-extern void init_volintInfo(struct volintInfo *vinfo);
-extern int UV_SetSecurity(register struct rx_securityClass *as,
-                         afs_int32 aindex);
-extern struct rx_connection *UV_Bind(afs_int32 aserver, afs_int32 port);
-extern void SubEnumerateEntry(struct nvldbentry *entry);
-extern void EnumerateEntry(struct nvldbentry *entry);
-extern int UV_NukeVolume(afs_int32 server, afs_int32 partid, afs_uint32 volid);
-extern int UV_PartitionInfo64(afs_int32 server, char *pname,
-                           struct diskPartition64 *partition);
+
+extern void MapHostToNetwork(struct nvldbentry *entry);
+
 extern int UV_CreateVolume(afs_int32 aserver, afs_int32 apart, char *aname,
                           afs_uint32 * anewid);
-extern int UV_CreateVolume2(afs_int32 aserver, afs_int32 apart, char *aname,
-                           afs_int32 aquota, afs_int32 aspare1,
-                           afs_int32 aspare2, afs_int32 aspare3,
-                           afs_int32 aspare4, afs_uint32 * anewid);
-extern int UV_CreateVolume3(afs_int32 aserver, afs_int32 apart, char *aname,
-                           afs_int32 aquota, afs_int32 aspare1,
-                           afs_int32 aspare2, afs_int32 aspare3,
-                           afs_int32 aspare4, afs_uint32 * anewid,
-                           afs_uint32 * aroid, afs_uint32 * abkid);
-extern int UV_AddVLDBEntry(afs_int32 aserver, afs_int32 apart, char *aname,
-                          afs_uint32 aid);
+
 extern int UV_DeleteVolume(afs_int32 aserver, afs_int32 apart,
                           afs_uint32 avolid);
-extern void sigint_handler(int x);
-extern int UV_MoveVolume(afs_uint32 afromvol, afs_int32 afromserver,
-                        afs_int32 afrompart, afs_int32 atoserver,
-                        afs_int32 atopart);
-extern int UV_MoveVolume2(afs_uint32 afromvol, afs_int32 afromserver, 
-                          afs_int32 afrompart, afs_int32 atoserver, 
-                          afs_int32 atopart, int flags);
-extern int UV_BackupVolume(afs_int32 aserver, afs_int32 apart,
-                          afs_uint32 avolid);
-extern int UV_ReleaseVolume(afs_uint32 afromvol, afs_int32 afromserver,
-                           afs_int32 afrompart, int forceflag);
-extern void dump_sig_handler(int x);
-extern int UV_DumpVolume(afs_uint32 afromvol, afs_int32 afromserver,
-                        afs_int32 afrompart, afs_int32 fromdate,
-                        afs_int32(*DumpFunction) (struct rx_call *, void *),
-                        void *rock, afs_int32 flags);
+
+extern int UV_SetSecurity(register struct rx_securityClass *as,
+                          afs_int32 aindex);
+
+extern int UV_ListOneVolume(afs_int32 aserver, afs_int32 apart,
+                           afs_uint32 volid, struct volintInfo **resultPtr);
+
 extern int UV_RestoreVolume(afs_int32 toserver, afs_int32 topart,
                            afs_uint32 tovolid, char tovolname[],
                            int restoreflags,
                            afs_int32(*WriteData) (struct rx_call *, void *),
                            void *rock);
-extern int UV_RestoreVolume2(afs_int32 toserver, afs_int32 topart,
-                            afs_uint32 tovolid, afs_int32 toparentid,
-                            char tovolname[], int flags,
-                             afs_int32(*WriteData) (struct rx_call *, void *),
-                            void *rock);
-extern int UV_LockRelease(afs_uint32 volid);
-extern int UV_AddSite(afs_int32 server, afs_int32 part, afs_uint32 volid,
-                     afs_int32 valid);
-extern int UV_AddSite2(afs_int32 server, afs_int32 part, afs_uint32 volid,
-                      afs_uint32 rovolid, afs_int32 valid);
-extern int UV_RemoveSite(afs_int32 server, afs_int32 part, afs_uint32 volid);
-extern int UV_ChangeLocation(afs_int32 server, afs_int32 part,
-                            afs_uint32 volid);
-extern int UV_ListPartitions(afs_int32 aserver, struct partList *ptrPartList,
-                            afs_int32 * cntp);
-extern int UV_ZapVolumeClones(afs_int32 aserver, afs_int32 apart,
-                             struct volDescription *volPtr,
-                             afs_int32 arraySize);
-extern int UV_GenerateVolumeClones(afs_int32 aserver, afs_int32 apart,
-                                  struct volDescription *volPtr,
-                                  afs_int32 arraySize);
-extern int UV_ListVolumes(afs_int32 aserver, afs_int32 apart, int all,
-                         struct volintInfo **resultPtr, afs_int32 * size);
-extern int UV_XListVolumes(afs_int32 a_serverID, afs_int32 a_partID,
-                          int a_all, struct volintXInfo **a_resultPP,
-                          afs_int32 * a_numEntsInResultP);
-extern int UV_ListOneVolume(afs_int32 aserver, afs_int32 apart,
-                           afs_uint32 volid, struct volintInfo **resultPtr);
-extern int UV_XListOneVolume(afs_int32 a_serverID, afs_int32 a_partID,
-                            afs_uint32 a_volID,
-                            struct volintXInfo **a_resultPP);
-extern int sortVolumes(const void *a, const void *b);
-extern int UV_SyncVolume(afs_int32 aserver, afs_int32 apart, char *avolname,
-                        int flags);
-extern int UV_SyncVldb(afs_int32 aserver, afs_int32 apart, int flags,
-                      int force);
-extern afs_int32 VolumeExists(afs_int32 server, afs_int32 partition,
-                             afs_uint32 volumeid);
-extern afs_int32 CheckVldbRWBK(struct nvldbentry *entry,
-                              afs_int32 * modified);
-extern int CheckVldbRO(struct nvldbentry *entry, afs_int32 * modified);
-extern afs_int32 CheckVldb(struct nvldbentry *entry, afs_int32 * modified);
-extern int UV_SyncServer(afs_int32 aserver, afs_int32 apart, int flags,
-                        int force);
-extern int UV_RenameVolume(struct nvldbentry *entry, char oldname[],
-                          char newname[]);
-extern int UV_VolserStatus(afs_int32 server, transDebugInfo ** rpntr,
-                          afs_int32 * rcount);
-extern int UV_VolumeZap(afs_int32 server, afs_int32 part, afs_uint32 volid);
-extern int UV_SetVolume(afs_int32 server, afs_int32 partition,
-                       afs_uint32 volid, afs_int32 transflag,
-                       afs_int32 setflag, int sleeptime);
-extern int UV_SetVolumeInfo(afs_int32 server, afs_int32 partition,
-                           afs_uint32 volid, volintInfo * infop);
-extern void MapNetworkToHost(struct nvldbentry *old, struct nvldbentry *new);
-extern void MapHostToNetwork(struct nvldbentry *entry);
-extern int UV_CopyVolume2(afs_uint32 afromvol, afs_int32 afromserver, 
-                          afs_int32 afrompart, char *atovolname, 
-                          afs_int32 atoserver, afs_int32 atopart,
-                          afs_uint32 atovolid, int flags);
-extern int UV_CloneVolume(afs_int32 aserver, afs_int32 apart, afs_uint32 avolid,
-                          afs_uint32 acloneid, char *aname, int flags);
-extern int UV_DumpClonedVolume(afs_uint32 afromvol, afs_int32 afromserver,
-                               afs_int32 afrompart, afs_int32 fromdate,
-                               afs_int32(*DumpFunction)
-                                         (struct rx_call *, void *),
-                              void *rock, afs_int32 flags);
-extern int UV_GetSize(afs_uint32 afromvol, afs_int32 afromserver, 
-                      afs_int32 afrompart, afs_int32 fromdate, 
-                      struct volintSize *vol_size);
-
-extern int verbose;
-extern int noresolve;
 #endif

diff --git a/src/volser/voltrans.c b/src/volser/voltrans.c
index 4e7184191c4f6cbc3506adf8d1e84c4acc0f2c36..bda887a33fe49f086c49248f231e98a5850173ac 100644 (file)
--- a/src/volser/voltrans.c
+++ b/src/volser/voltrans.c
@@ -62,7 +62,7 @@
 
 #include "volint.h"
 #include "volser.h"
-#include "volser_prototypes.h"
+#include "volser_internal.h"
 
 static struct volser_trans *allTrans = 0;
 static afs_int32 transCounter = 1;

diff --git a/src/volser/vos.c b/src/volser/vos.c
index 8d563401de36ec91341dd8ccca104639baf48556..0428be0e649ddb27923bad1d7e3c1f1636cf8db0 100644 (file)
--- a/src/volser/vos.c
+++ b/src/volser/vos.c
@@ -58,6 +58,7 @@
 #ifdef AFS_AIX32_ENV
 #include <signal.h>
 #endif
+#include "volser_internal.h"
 #include "volser_prototypes.h"
 #include "vsutils_prototypes.h"
 #include "lockprocs_prototypes.h"

diff --git a/src/volser/vsprocs.c b/src/volser/vsprocs.c
index 0105608affb29e32da24da9d1a0c048c2e8cd99d..fe7d1c9e36fc4dc7a9c913b0ab2dc3fedb66f527 100644 (file)
--- a/src/volser/vsprocs.c
+++ b/src/volser/vsprocs.c
@@ -62,6 +62,7 @@
 #include <afs/procmgmt.h>      /* signal(), kill(), wait(), etc. */
 #include <setjmp.h>
 
+#include "volser_internal.h"
 #include "volser_prototypes.h"
 #include "vsutils_prototypes.h"
 #include "lockprocs_prototypes.h"