more namespace cleanup: remove uses of rpc_int32 and rpc_u_int32

ticket: 2601
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16522 dc483132-0cff-0310-8789-dd5450dbe970

7 files changed, 29 insertions, 18 deletions

diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index 9b70eecf9..9e367e9a4 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-25  Tom Yu  <tlyu@mit.edu>
+
+	* ovsec_kadmd.c (log_badverf): Use rpcproc_t instead of
+	rpc_u_int32 in procnames.
+
 2004-06-15  Tom Yu  <tlyu@mit.edu>
 
 	* kadm_rpc_svc.c (check_rpcsec_auth, gss_to_krb5_name): New
diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index e7e995d18..f9c8781bb 100644
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -917,7 +917,7 @@ void log_badverf(gss_name_t client_name, gss_name_t server_name,
 		 *data)
 {
      struct procnames {
-	  rpc_u_int32 proc;
+	  rpcproc_t proc;
 	  const char *proc_name;
      };
      static const struct procnames proc_names[] = {
diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog
index 5beaa3a98..c0630ac9b 100644
--- a/src/lib/kadm5/ChangeLog
+++ b/src/lib/kadm5/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-25  Tom Yu  <tlyu@mit.edu>
+
+	* adb.h:
+	* kadm_rpc_xdr.c: rpc_u_int32 -> uint32_t
+
 2004-06-24  Tom Yu  <tlyu@mit.edu>
 
 	* alt_prof.c (kadm5_get_admin_service_name): Fix call to
diff --git a/src/lib/kadm5/adb.h b/src/lib/kadm5/adb.h
index 7b49adc50..8b53b5501 100644
--- a/src/lib/kadm5/adb.h
+++ b/src/lib/kadm5/adb.h
@@ -69,12 +69,12 @@ typedef struct _osa_princ_ent_t {
 typedef struct _osa_policy_ent_t {
     int		version;
     char	*name;
-    rpc_u_int32	pw_min_life;
-    rpc_u_int32	pw_max_life;
-    rpc_u_int32	pw_min_length;
-    rpc_u_int32	pw_min_classes;
-    rpc_u_int32	pw_history_num;
-    rpc_u_int32	policy_refcnt;
+    uint32_t	pw_min_life;
+    uint32_t	pw_max_life;
+    uint32_t	pw_min_length;
+    uint32_t	pw_min_classes;
+    uint32_t	pw_history_num;
+    uint32_t	policy_refcnt;
 } osa_policy_ent_rec, *osa_policy_ent_t;
 
 typedef	void	(*osa_adb_iter_princ_func) (void *, osa_princ_ent_t);
diff --git a/src/lib/kadm5/kadm_rpc_xdr.c b/src/lib/kadm5/kadm_rpc_xdr.c
index 57f1ffea7..f5a34e925 100644
--- a/src/lib/kadm5/kadm_rpc_xdr.c
+++ b/src/lib/kadm5/kadm_rpc_xdr.c
@@ -25,7 +25,7 @@ bool_t xdr_ui_4(XDR *xdrs, krb5_ui_4 *objp)
 {
   /* Assumes that krb5_ui_4 and u_int32 are both four bytes long.
      This should not be a harmful assumption. */
-  return xdr_u_int32(xdrs, (rpc_u_int32 *) objp);
+  return xdr_u_int32(xdrs, (uint32_t *) objp);
 }
 
 
@@ -123,7 +123,7 @@ xdr_krb5_timestamp(XDR *xdrs, krb5_timestamp *objp)
   /* This assumes that int32 and krb5_timestamp are the same size.
      This shouldn't be a problem, since we've got a unit test which
      checks for this. */
-	if (!xdr_int32(xdrs, (rpc_int32 *) objp)) {
+	if (!xdr_int32(xdrs, (int32_t *) objp)) {
 		return (FALSE);
 	}
 	return (TRUE);
@@ -154,7 +154,7 @@ xdr_krb5_deltat(XDR *xdrs, krb5_deltat *objp)
   /* This assumes that int32 and krb5_deltat are the same size.
      This shouldn't be a problem, since we've got a unit test which
      checks for this. */
-	if (!xdr_int32(xdrs, (rpc_int32 *) objp)) {
+	if (!xdr_int32(xdrs, (int32_t *) objp)) {
 		return (FALSE);
 	}
 	return (TRUE);
@@ -166,7 +166,7 @@ xdr_krb5_flags(XDR *xdrs, krb5_flags *objp)
   /* This assumes that int32 and krb5_flags are the same size.
      This shouldn't be a problem, since we've got a unit test which
      checks for this. */
-	if (!xdr_int32(xdrs, (rpc_int32 *) objp)) {
+	if (!xdr_int32(xdrs, (int32_t *) objp)) {
 		return (FALSE);
 	}
 	return (TRUE);
@@ -175,7 +175,7 @@ xdr_krb5_flags(XDR *xdrs, krb5_flags *objp)
 bool_t
 xdr_krb5_ui_4(XDR *xdrs, krb5_ui_4 *objp)
 {
-	if (!xdr_u_int32(xdrs, (rpc_u_int32 *) objp)) {
+	if (!xdr_u_int32(xdrs, (uint32_t *) objp)) {
 		return (FALSE);
 	}
 	return (TRUE);
@@ -343,10 +343,10 @@ bool_t xdr_krb5_tl_data(XDR *xdrs, krb5_tl_data **tl_data_head)
 bool_t
 xdr_kadm5_ret_t(XDR *xdrs, kadm5_ret_t *objp)
 {
-	rpc_u_int32 tmp;
+	uint32_t tmp;
 
 	if (xdrs->x_op == XDR_ENCODE)
-		tmp = (rpc_u_int32) *objp;
+		tmp = (uint32_t) *objp;
 
 	if (!xdr_u_int32(xdrs, &tmp))
 		return (FALSE);
@@ -1018,7 +1018,7 @@ xdr_krb5_enctype(XDR *xdrs, krb5_enctype *objp)
 bool_t
 xdr_krb5_salttype(XDR *xdrs, krb5_int32 *objp)
 {
-    if (!xdr_int32(xdrs, (rpc_int32 *) objp))
+    if (!xdr_int32(xdrs, (int32_t *) objp))
 	return FALSE;
     return TRUE;
 }
diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog
index dde496e0b..141e9739f 100644
--- a/src/lib/rpc/ChangeLog
+++ b/src/lib/rpc/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-25  Tom Yu  <tlyu@mit.edu>
+
+	* types.hin: Delete rpc_int32, rpc_u_int32 aliases.
+
 2004-06-24  Ken Raeburn  <raeburn@mit.edu>
 
 	* configure.in: Fix typo in setting
diff --git a/src/lib/rpc/types.hin b/src/lib/rpc/types.hin
index 8c677564f..8c10b715a 100644
--- a/src/lib/rpc/types.hin
+++ b/src/lib/rpc/types.hin
@@ -130,9 +130,6 @@ typedef uint32_t	rpcproc_t;
 typedef uint32_t	rpcport_t;
 typedef int32_t		rpc_inline_t;
 
-typedef int32_t		rpc_int32;
-typedef uint32_t	rpc_u_int32;
-
 /* This is for rpc/netdb.h */
 @rpcent_define@