From be305ae119c4bd71431596f81d97f9195faa069f Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Wed, 11 Nov 2009 10:13:57 +0000
Subject: [PATCH] Prototype UV_Bind

Publicly prototype UV_Bind in volser_prototypes.h

Make dump.c use the public prototype, instead of an incomplete
private copy, and remove the warning inhibition that was required to
support the private copy.

Change-Id: I945192454702d79083a10062adaf2cb124d14a35
Reviewed-on: http://gerrit.openafs.org/809
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---
 README.WARNINGS                | 1 -
 src/butc/dump.c                | 8 +-------
 src/volser/volser_internal.h   | 1 -
 src/volser/volser_prototypes.h | 2 ++
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/README.WARNINGS b/README.WARNINGS
index a449d95..2c47034 100644
--- a/README.WARNINGS
+++ b/README.WARNINGS
@@ -56,7 +56,6 @@ budb/server.c        : all	     : ExtendedCellInfo
 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
 kauth/kaserver.c     : all	     : ExtendedCellInfo
 kauth/admin_tools.c  : all           : ubik_Call nonsense
diff --git a/src/butc/dump.c b/src/butc/dump.c
index 1b104e3..49b99be 100644
--- a/src/butc/dump.c
+++ b/src/butc/dump.c
@@ -10,10 +10,6 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-#ifdef IGNORE_SOME_GCC_WARNINGS
-# pragma GCC diagnostic warning "-Wstrict-prototypes"
-#endif
-
 #include <sys/types.h>
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
@@ -39,6 +35,7 @@
 #include <afs/ktime.h>
 #include <afs/vlserver.h>
 #include <afs/volser.h>
+#include <afs/volser_prototypes.h>
 #include <afs/volint.h>
 #include <afs/cellconfig.h>
 #include <afs/bucoord_prototypes.h>
@@ -48,7 +45,6 @@
 #include "butc_xbsa.h"
 #include "afs/butx.h"
 
-
 /* GLOBAL CONFIGURATION PARAMETERS */
 extern int dump_namecheck;
 extern int queryoperator;
@@ -59,8 +55,6 @@ extern struct ubik_client *cstruct;
 dlqlinkT savedEntries;
 dlqlinkT entries_to_flush;
 
-extern struct rx_connection *UV_Bind();
-
 extern afs_int32 groupId;
 extern afs_int32 BufferSize;
 extern afs_int32 statusSize;
diff --git a/src/volser/volser_internal.h b/src/volser/volser_internal.h
index 52a2dcf..b0e8b60 100644
--- a/src/volser/volser_internal.h
+++ b/src/volser/volser_internal.h
@@ -36,7 +36,6 @@ 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);
diff --git a/src/volser/volser_prototypes.h b/src/volser/volser_prototypes.h
index 63c130f..cabaede 100644
--- a/src/volser/volser_prototypes.h
+++ b/src/volser/volser_prototypes.h
@@ -18,6 +18,8 @@ extern void MapPartIdIntoName(afs_int32 partId, char *partName);
 
 extern void MapHostToNetwork(struct nvldbentry *entry);
 
+extern struct rx_connection *UV_Bind(afs_int32 aserver, afs_int32 port);
+
 extern int UV_CreateVolume(afs_int32 aserver, afs_int32 apart, char *aname,
 			   afs_uint32 * anewid);
 
-- 
1.9.4