Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-28 07:58:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make formal param const; add initial value to relay-only field so

Browse source 
asserts don't fail b/c of uninitialized value; don't typedef array:
make array field of struct.
This commit is contained in:
ehouse 2006-09-14 01:25:40 +00:00
parent 4479cf530d
commit 100598a35f
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
xwords4/common/comms.c
View file

@ -84,7 +84,7 @@ struct CommsCtxt {
/* The following fields, down to isServer, are only used if BEYOND_IR is
defined, but I'm leaving them in here so apps built both ways can open
each saved games files.*/
each other's saved games files.*/
CommsAddrRec addr;
/* Stuff for relays */
@ -117,7 +117,8 @@ struct CommsCtxt {
****************************************************************************/
static AddressRecord* rememberChannelAddress( CommsCtxt* comms,
XP_PlayerAddr channelNo,
XWHostID id, CommsAddrRec* addr );
XWHostID id,
const CommsAddrRec* addr );
static XP_Bool channelToAddress( CommsCtxt* comms, XP_PlayerAddr channelNo,
CommsAddrRec** addr );
static AddressRecord* getRecordFor( CommsCtxt* comms,
@ -316,7 +317,7 @@ comms_makeFromStream( MPFORMAL XWStreamCtxt* stream, XW_UtilCtxt* util,
rec->nextMsgID = stream_getU16( stream );
rec->lastMsgReceived = stream_getU16( stream );
rec->channelNo = stream_getU16( stream );
rec->hostID = stream_getU8( stream );
rec->hostID = stream_getU8( stream ); /* unneeded unless RELAY */
#ifdef DEBUG
rec->lastACK = stream_getU16( stream );
@ -439,7 +440,7 @@ comms_writeToStream( CommsCtxt* comms, XWStreamCtxt* stream )
stream_putU16( stream, (XP_U16)rec->nextMsgID );
stream_putU16( stream, (XP_U16)rec->lastMsgReceived );
stream_putU16( stream, rec->channelNo );
stream_putU8( stream, rec->hostID );
stream_putU8( stream, rec->hostID ); /* unneeded unless RELAY */
#ifdef DEBUG
stream_putU16( stream, rec->lastACK );
stream_putU16( stream, rec->nUniqueBytes );
@ -821,7 +822,7 @@ relayPreProcess( CommsCtxt* comms, XWStreamCtxt* stream, XWHostID* senderID )
*/
XP_Bool
comms_checkIncomingStream( CommsCtxt* comms, XWStreamCtxt* stream,
CommsAddrRec* addr )
const CommsAddrRec* addr )
{
XP_U16 channelNo;
XP_U32 connID;
@ -829,7 +830,7 @@ comms_checkIncomingStream( CommsCtxt* comms, XWStreamCtxt* stream,
MsgID lastMsgRcd;
XP_Bool validMessage = XP_FALSE;
AddressRecord* recs = (AddressRecord*)NULL;
XWHostID senderID;
XWHostID senderID = 0; /* unset; default for non-relay cases */
XP_Bool usingRelay = XP_FALSE;
XP_Bool channelWas0 = XP_FALSE;
@ -990,7 +991,7 @@ comms_getStats( CommsCtxt* comms, XWStreamCtxt* stream )
static AddressRecord*
rememberChannelAddress( CommsCtxt* comms, XP_PlayerAddr channelNo,
XWHostID hostID, CommsAddrRec* addr )
XWHostID hostID, const CommsAddrRec* addr )
{
AddressRecord* recs = NULL;
recs = getRecordFor( comms, channelNo );

6
xwords4/common/comms.h
View file

@ -44,8 +44,8 @@ typedef enum {
/* on Palm BtLibDeviceAddressType is a 48-bit quantity. Linux's typeis the
same size. Goal is something all platforms support */
typedef XP_U8 XP_BtAddr[6];
typedef XP_UCHAR XP_BtAddrStr[18];
typedef struct XP_BtAddr { XP_U8 bits[6]; } XP_BtAddr;
typedef struct XP_BtAddrStr { XP_UCHAR chars[18]; } XP_BtAddrStr;
#define MAX_HOSTNAME_LEN 63
typedef struct CommsAddrRec {
@ -109,7 +109,7 @@ XP_S16 comms_resendAll( CommsCtxt* comms );
XP_Bool comms_checkIncomingStream( CommsCtxt* comms, XWStreamCtxt* stream,
CommsAddrRec* addr );
const CommsAddrRec* addr );
# ifdef DEBUG
void comms_getStats( CommsCtxt* comms, XWStreamCtxt* stream );