From 8d546dcc90d861df24cef6fcded2fbc5998d7407 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Fri, 10 Jul 2009 13:40:56 +0100
Subject: [PATCH] Remove pr_PrintEntry from public headers

pr_PrintEntry isn't used outside of the ptserver directory, and requires
struct prentry, which is defined internally, so remove it from ptuser.h,
and create a new internal header to hold it.

Also, tidy up some type mismatch warnings by making static strings const
char *

Reviewed-on: http://gerrit.openafs.org/22
Reviewed-by: Russ Allbery <rra@stanford.edu>
Verified-by: Russ Allbery <rra@stanford.edu>
---
 src/ptserver/db_verify.c |  3 ++-
 src/ptserver/display.c   |  1 +
 src/ptserver/display.h   | 16 ++++++++++++++++
 src/ptserver/pt_util.c   |  2 +-
 src/ptserver/ptserver.c  |  2 +-
 src/ptserver/ptuser.h    |  4 ----
 6 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 src/ptserver/display.h

diff --git a/src/ptserver/db_verify.c b/src/ptserver/db_verify.c
index c5e53bec4..ce363785d 100644
--- a/src/ptserver/db_verify.c
+++ b/src/ptserver/db_verify.c
@@ -55,10 +55,11 @@
 #include "pterror.h"
 #include "ptserver.h"
 #include "ptuser.h"
+#include "display.h"
 
 struct prheader cheader;
 int fd;
-char *pr_dbaseName;
+const char *pr_dbaseName;
 char *whoami = "db_verify";
 #define UBIK_HEADERSIZE 64
 
diff --git a/src/ptserver/display.c b/src/ptserver/display.c
index 25451c764..be5be10a5 100644
--- a/src/ptserver/display.c
+++ b/src/ptserver/display.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include "ptserver.h"
 
+#include "display.h"
 
 #ifdef PR_REMEMBER_TIMES
 
diff --git a/src/ptserver/display.h b/src/ptserver/display.h
new file mode 100644
index 000000000..177b7c55b
--- /dev/null
+++ b/src/ptserver/display.h
@@ -0,0 +1,16 @@
+/*
+ * 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 _PTSERVER_DISPLAY_H
+#define _PTSERVER_DISPLAY_H
+
+extern int pr_PrintEntry(FILE *f, int hostOrder, afs_int32 ea,
+			 struct prentry *e, int indent);
+
+#endif
diff --git a/src/ptserver/pt_util.c b/src/ptserver/pt_util.c
index a442e6475..4faf2edb5 100644
--- a/src/ptserver/pt_util.c
+++ b/src/ptserver/pt_util.c
@@ -148,7 +148,7 @@ CommandProc(register struct cmd_syndesc *a_as, void *arock)
     struct prentry uentry, gentry;
     struct ubik_hdr *uh;
     char *dfile = 0;
-    char *pbase = AFSDIR_SERVER_PRDB_FILEPATH;
+    const char *pbase = AFSDIR_SERVER_PRDB_FILEPATH;
     char *pfile = NULL;
     char pbuffer[1028];
     struct cmd_parmdesc *tparm;
diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c
index 43c206aed..6758b0858 100644
--- a/src/ptserver/ptserver.c
+++ b/src/ptserver/ptserver.c
@@ -210,7 +210,7 @@ main(int argc, char **argv)
     char hostname[64];
     struct rx_service *tservice;
     struct rx_securityClass *sc[3];
-    extern int RXSTATS_ExecuteRequest();
+    extern int RXSTATS_ExecuteRequest(struct rx_call *);
 #if 0
     struct ktc_encryptionKey tkey;
 #endif
diff --git a/src/ptserver/ptuser.h b/src/ptserver/ptuser.h
index 75fd71fb4..8653febe7 100644
--- a/src/ptserver/ptuser.h
+++ b/src/ptserver/ptuser.h
@@ -12,10 +12,6 @@
 
 #include "afs/ptint.h"
 
-/* display.c */
-extern int pr_PrintEntry(FILE *f, int hostOrder, afs_int32 ea, 
- 			 struct prentry *e, int indent);
- 
 /* ptuser.c */
 extern afs_int32 pr_Initialize(afs_int32 secLevel, const char *confDir, 
  			       char *cell);
-- 
2.39.5