From 200658834fcb22ca608dba8856d2d47872d3b2b3 Mon Sep 17 00:00:00 2001
From: Benjamin Kaduk <kaduk@mit.edu>
Date: Fri, 25 Apr 2014 15:24:22 -0400
Subject: [PATCH] Some rx type cleanup for signedness

The epoch, Cid, and security header/trailer sizes are all fundamentally
unsigned quantities.  Change the types exposed in some API signatures
to match this reality, and also change the global variables for the
epoch and Cid to match.  (Per-connection variables were already of
an unsigned type.)

Change-Id: I4a56736ef7d78028d1d0b980cda0b4c37d694388
Reviewed-on: http://gerrit.openafs.org/11106
Reviewed-by: Perry Ruiter <pruiter@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: D Brashear <shadow@your-file-system.com>
---
 src/rx/rx.h         | 16 ++++++++--------
 src/rx/rx_conn.c    | 16 ++++++++--------
 src/rx/rx_globals.h |  4 ++--
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/rx/rx.h b/src/rx/rx.h
index da5dd9f..d1a4836 100644
--- a/src/rx/rx.h
+++ b/src/rx/rx.h
@@ -69,17 +69,17 @@ struct rx_packet;
 
 /* Connection management */
 
-extern void rx_SetConnectionEpoch(struct rx_connection *conn, int epoch);
-extern int  rx_GetConnectionEpoch(struct rx_connection *conn);
-extern void rx_SetConnectionId(struct rx_connection *conn, int id);
-extern int  rx_GetConnectionId(struct rx_connection *conn);
+extern void rx_SetConnectionEpoch(struct rx_connection *conn, afs_uint32 epoch);
+extern afs_uint32  rx_GetConnectionEpoch(struct rx_connection *conn);
+extern void rx_SetConnectionId(struct rx_connection *conn, afs_uint32 id);
+extern afs_uint32  rx_GetConnectionId(struct rx_connection *conn);
 extern void *rx_GetSecurityData(struct rx_connection *conn);
 extern void  rx_SetSecurityData(struct rx_connection *conn, void *data);
 extern int  rx_IsUsingPktCksum(struct rx_connection *conn);
-extern void rx_SetSecurityHeaderSize(struct rx_connection *conn, int size);
-extern int  rx_GetSecurityHeaderSize(struct rx_connection *conn);
-extern void rx_SetSecurityMaxTrailerSize(struct rx_connection *conn, int size);
-extern int  rx_GetSecurityMaxTrailerSize(struct rx_connection *conn);
+extern void rx_SetSecurityHeaderSize(struct rx_connection *conn, afs_uint32 size);
+extern afs_uint32  rx_GetSecurityHeaderSize(struct rx_connection *conn);
+extern void rx_SetSecurityMaxTrailerSize(struct rx_connection *conn, afs_uint32 size);
+extern afs_uint32  rx_GetSecurityMaxTrailerSize(struct rx_connection *conn);
 extern void rx_SetMsgsizeRetryErr(struct rx_connection *conn, int err);
 extern int  rx_IsServerConn(struct rx_connection *conn);
 extern int  rx_IsClientConn(struct rx_connection *conn);
diff --git a/src/rx/rx_conn.c b/src/rx/rx_conn.c
index f6b8d41..e8b7cbe 100644
--- a/src/rx/rx_conn.c
+++ b/src/rx/rx_conn.c
@@ -17,21 +17,21 @@
 #include "rx_conn.h"
 
 void
-rx_SetConnectionEpoch(struct rx_connection *conn, afs_int32 epoch) {
+rx_SetConnectionEpoch(struct rx_connection *conn, afs_uint32 epoch) {
     conn->epoch = epoch;
 }
 
-int
+afs_uint32
 rx_GetConnectionEpoch(struct rx_connection *conn) {
     return conn->epoch;
 }
 
 void
-rx_SetConnectionId(struct rx_connection *conn, int cid) {
+rx_SetConnectionId(struct rx_connection *conn, afs_uint32 cid) {
     conn->cid = cid;
 }
 
-int
+afs_uint32
 rx_GetConnectionId(struct rx_connection *conn) {
     return conn->cid;
 }
@@ -54,24 +54,24 @@ rx_IsUsingPktCksum(struct rx_connection *conn)
 }
 
 void
-rx_SetSecurityHeaderSize(struct rx_connection *conn, int size)
+rx_SetSecurityHeaderSize(struct rx_connection *conn, afs_uint32 size)
 {
     conn->securityHeaderSize = size;
 }
 
-int
+afs_uint32
 rx_GetSecurityHeaderSize(struct rx_connection *conn)
 {
     return conn->securityHeaderSize;
 }
 
 void
-rx_SetSecurityMaxTrailerSize(struct rx_connection *conn, int size)
+rx_SetSecurityMaxTrailerSize(struct rx_connection *conn, afs_uint32 size)
 {
     conn->securityMaxTrailerSize = size;
 }
 
-int
+afs_uint32
 rx_GetSecurityMaxTrailerSize(struct rx_connection *conn)
 {
     return conn->securityMaxTrailerSize;
diff --git a/src/rx/rx_globals.h b/src/rx/rx_globals.h
index 602a7e5..1566878 100644
--- a/src/rx/rx_globals.h
+++ b/src/rx/rx_globals.h
@@ -506,8 +506,8 @@ EXT afs_int32 rxi_availProcs GLOBALSINIT(0);	/* number of threads in the pool */
 EXT afs_int32 rxi_totalMin GLOBALSINIT(0);	/* Sum(minProcs) forall services */
 EXT afs_int32 rxi_minDeficit GLOBALSINIT(0);	/* number of procs needed to handle all minProcs */
 
-EXT int rx_nextCid;		/* Next connection call id */
-EXT int rx_epoch;		/* Initialization time of rx */
+EXT afs_uint32 rx_nextCid;		/* Next connection call id */
+EXT afs_uint32 rx_epoch;		/* Initialization time of rx */
 #ifdef	RX_ENABLE_LOCKS
 EXT afs_kcondvar_t rx_waitingForPackets_cv;
 #endif
-- 
1.9.4