This commit is contained in:
Eric House 2011-09-22 17:31:57 -07:00
parent f0c3e2c5f0
commit 26ba812aff
2 changed files with 7 additions and 10 deletions

View file

@ -1,4 +1,4 @@
/* -*- compile-command: "cd ../linux && make MEMDEBUG=TRUE"; -*- */
/* -*- compile-command: "cd ../linux && make MEMDEBUG=TRUE -j3"; -*- */
/*
* Copyright 2001-2011 by Eric House (xwords@eehouse.org). All rights
* reserved.
@ -298,7 +298,7 @@ comms_make( MPFORMAL XW_UtilCtxt* util, XP_Bool isServer,
#ifdef COMMS_XPORT_FLAGSPROC
result->xportFlags = (*result->procs.getFlags)(result->procs.closure);
#else
result->xportFlags = result.procs.flags;
result->xportFlags = result->procs.flags;
#endif
}
result->util = util;
@ -2133,7 +2133,6 @@ send_via_relay( CommsCtxt* comms, XWRELAY_Cmd cmd, XWHostID destID,
if ( tmpStream != NULL ) {
XP_U16 len = 0;
XP_U8* buf;
len = stream_getSize( tmpStream );
if ( 0 < len ) {
@ -2171,12 +2170,10 @@ sendNoConn( CommsCtxt* comms, const MsgQueueElem* elem, XWHostID destID )
destID, elem->msg, elem->len );
if ( NULL != stream ) {
XP_U16 len = stream_getSize( stream );
XP_U8* buf = XP_MALLOC( comms->mpool, len );
if ( buf != NULL ) {
stream_getBytes( stream, buf, len );
success = (*comms->procs.sendNoConn)( buf, len, relayID,
if ( 0 < len ) {
success = (*comms->procs.sendNoConn)( stream_getPtr( stream ),
len, relayID,
comms->procs.closure );
XP_FREE( comms->mpool, buf );
}
stream_destroy( stream );
}

View file

@ -1,4 +1,4 @@
/* -*-mode: C; fill-column: 78; c-basic-offset: 4; compile-command: "make MEMDEBUG=TRUE"; -*- */
/* -*- compile-command: "make MEMDEBUG=TRUE -j3"; -*- */
/*
* Copyright 2000-2009 by Eric House (xwords@eehouse.org). All rights
* reserved.
@ -419,7 +419,7 @@ onetime_idle( gpointer data )
{
LOG_FUNC();
CursesAppGlobals* globals = (CursesAppGlobals*)data;
if ( server_do( globals->cGlobals.game.server ) ) {
if ( server_do( globals->cGlobals.game.server, NULL ) ) {
if ( !!globals->cGlobals.game.board ) {
board_draw( globals->cGlobals.game.board );
}