jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 23:40:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rx-kill-void-stupidity-20080208

Browse Source 
LICENSE IPL10

remove VOID since it conflicts with this. and we shouldn't need it anymore anyway
This commit is contained in:
Derrick Brashear 2008-02-08 21:19:02 +00:00
parent 629feb40c4
commit 607c0959f0
4 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rx/rx.c
View File

@ -763,9 +763,7 @@ rx_NewConnection(register afs_uint32 shost, u_short sport, u_short sservice,
conn->peer = rxi_FindPeer(shost, sport, 0, 1);
conn->serviceId = sservice;
conn->securityObject = securityObject;
/* This doesn't work in all compilers with void (they're buggy), so fake it
* with VOID */
conn->securityData = (VOID *) 0;
conn->securityData = (void *) 0;
conn->securityIndex = serviceSecurityIndex;
rx_SetConnDeadTime(conn, rx_connDeadTime);
conn->ackRate = RX_FAST_ACK_RATE;
@ -1839,9 +1837,9 @@ rx_GetCall(int tno, struct rx_service *cur_service, osi_socket * socketp)
void
rx_SetArrivalProc(register struct rx_call *call,
register void (*proc) (register struct rx_call * call,
register VOID * mh,
register void * mh,
register int index),
register VOID * handle, register int arg)
register void * handle, register int arg)
{
call->arrivalProc = proc;
call->arrivalProcHandle = handle;

14
src/rx/rx.h
View File

@ -23,12 +23,6 @@
#define _RX_
#ifndef KDUMP_RX_LOCK
/* Substitute VOID (char) for void, because some compilers are confused by void
* in some situations */
#ifndef AFS_NT40_ENV
#define VOID char
#endif
#ifdef KERNEL
#include "rx_kmutex.h"
#include "rx_kernel.h"
@ -260,7 +254,7 @@ struct rx_connection {
u_char securityIndex; /* corresponds to the security class of the */
/* securityObject for this conn */
struct rx_securityClass *securityObject; /* Security object for this connection */
VOID *securityData; /* Private data for this conn's security class */
void *securityData; /* Private data for this conn's security class */
u_short securityHeaderSize; /* Length of security module's packet header data */
u_short securityMaxTrailerSize; /* Length of security module's packet trailer data */
@ -511,8 +505,8 @@ struct rx_call {
int abortCount; /* number of times last error was sent */
u_int lastSendTime; /* Last time a packet was sent on this call */
u_int lastReceiveTime; /* Last time a packet was received for this call */
void (*arrivalProc) (register struct rx_call * call, register VOID * mh, register int index); /* Procedure to call when reply is received */
VOID *arrivalProcHandle; /* Handle to pass to replyFunc */
void (*arrivalProc) (register struct rx_call * call, register void * mh, register int index); /* Procedure to call when reply is received */
void *arrivalProcHandle; /* Handle to pass to replyFunc */
int arrivalProcArg; /* Additional arg to pass to reply Proc */
afs_uint32 lastAcked; /* last packet "hard" acked by receiver */
afs_uint32 startWait; /* time server began waiting for input data/send quota */
@ -759,7 +753,7 @@ struct rx_securityClass {
int (*op_Spare2) (void);
int (*op_Spare3) (void);
} *ops;
VOID *privateData;
void *privateData;
int refCount;
};

4
src/rx/rx_multi.c
View File

@ -55,7 +55,7 @@ multi_Init(struct rx_connection **conns, register int nConns)
for (i = 0; i < nConns; i++) {
register struct rx_call *call;
call = mh->calls[i] = rx_NewCall(conns[i]);
rx_SetArrivalProc(call, multi_Ready, (VOID *) mh, i);
rx_SetArrivalProc(call, multi_Ready, (void *) mh, i);
}
return mh;
}
@ -95,7 +95,7 @@ multi_Select(register struct multi_handle *mh)
/* Called by Rx when the first reply packet of a call is received, or the call is aborted. */
void
multi_Ready(register struct rx_call *call, register VOID *amh,
multi_Ready(register struct rx_call *call, register void *amh,
register int index)
{
register struct multi_handle *mh = (struct multi_handle *)amh;

6
src/rx/rx_prototypes.h
View File

@ -63,9 +63,9 @@ extern struct rx_call *rx_GetCall(int tno, struct rx_service *cur_service,
extern void rx_SetArrivalProc(register struct rx_call *call,
register void (*proc) (register struct rx_call *
call,
register VOID * mh,
register void * mh,
register int index),
register VOID * handle, register int arg);
register void * handle, register int arg);
extern afs_int32 rx_EndCall(register struct rx_call *call, afs_int32 rc);
extern void rx_Finalize(void);
extern void rxi_PacketsUnWait(void);
@ -453,7 +453,7 @@ extern struct multi_handle *multi_Init(struct rx_connection **conns,
register int nConns);
extern int multi_Select(register struct multi_handle *mh);
extern void multi_Ready(register struct rx_call *call,
register VOID *mh, register int index);
register void *mh, register int index);
extern void multi_Finalize(register struct multi_handle *mh);
extern void multi_Finalize_Ignore(register struct multi_handle *mh);