Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace all __FUNCTION__ with __func__

Browse source
This commit is contained in:
ehouse 2007-12-02 19:13:25 +00:00
parent c10a3a7340
commit b527110379
25 changed files with 69 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/board.c
View file

@ -2913,7 +2913,7 @@ board_focusChanged( BoardCtxt* board, BoardObjectType typ, XP_Bool gained )
draw = invalFocusOwner( board ) || draw;
}
board->focussed = typ;
XP_LOGF( "%s: set focussed to %s", __FUNCTION__,
XP_LOGF( "%s: set focussed to %s", __func__,
BoardObjectType_2str(typ) );
board->focusHasDived = XP_FALSE;
draw = invalFocusOwner( board ) || draw;
@ -3003,7 +3003,7 @@ figureNextLoc( BoardCtxt* board, XP_Key cursorKey,
end = max;
break;
default:
XP_LOGF( "%s: odd cursor key: %d", __FUNCTION__, cursorKey );
XP_LOGF( "%s: odd cursor key: %d", __func__, cursorKey );
}
if ( incr != 0 ) {

6
common/comms.c
View file

@ -1094,7 +1094,7 @@ comms_checkIncomingStream( CommsCtxt* comms, XWStreamCtxt* stream,
with an existing channel. */
channelNo = ++comms->nextChannelNo;
XP_LOGF( "%s: incrementled nextChannelNo "
"to %d", __FUNCTION__,
"to %d", __func__,
comms->nextChannelNo );
channelWas0 = XP_TRUE;
}
@ -1154,14 +1154,14 @@ comms_checkIncomingStream( CommsCtxt* comms, XWStreamCtxt* stream,
}
}
} else {
XP_LOGF( "%s: message too small", __FUNCTION__ );
XP_LOGF( "%s: message too small", __func__ );
}
} else {
XP_STATUSF( "refusing non-matching connID; got %lx, "
"wanted %lx", connID, comms->connID );
}
} else {
XP_LOGF( "%s: message too small", __FUNCTION__ );
XP_LOGF( "%s: message too small", __func__ );
}
}
LOG_RETURNF( "%d", (XP_U16)validMessage );

2
common/comtypes.h
View file

@ -183,7 +183,7 @@ typedef struct CommonPrefs {
#endif
#define LOG_FUNC() XP_LOGF( "IN: %s", __FUNCTION__ )
#define LOG_FUNC() XP_LOGF( "IN: %s", __func__ )
#define LOG_RETURNF(fmt, ...) XP_LOGF( "%s => " fmt, __func__, __VA_ARGS__ )
#define LOG_RETURN_VOID() LOG_RETURNF("%s","void")

6
common/dbgutil.c
View file

@ -38,7 +38,7 @@ XP_Key_2str( XP_Key key )
CASESTR(XP_RAISEFOCUS_KEY);
CASESTR(XP_RETURN_KEY);
CASESTR(XP_KEY_LAST );
default: return FUNC(__FUNCTION__) " unknown";
default: return FUNC(__func__) " unknown";
}
}
@ -49,7 +49,7 @@ DrawFocusState_2str( DrawFocusState dfs )
CASESTR(DFS_NONE);
CASESTR(DFS_TOP);
CASESTR(DFS_DIVED);
default: return FUNC(__FUNCTION__) " unknown";
default: return FUNC(__func__) " unknown";
}
}
@ -61,7 +61,7 @@ BoardObjectType_2str( BoardObjectType obj )
CASESTR(OBJ_BOARD);
CASESTR(OBJ_SCORE);
CASESTR(OBJ_TRAY);
default: return FUNC(__FUNCTION__) " unknown";
default: return FUNC(__func__) " unknown";
}
}

2
common/game.c
View file

@ -206,7 +206,7 @@ game_makeFromStream( MPFORMAL XWStreamCtxt* stream, XWGame* game,
board_prefsChanged( game->board, cp );
success = XP_TRUE;
} else {
XP_LOGF( "%s: aborting; stream version too new!", __FUNCTION__ );
XP_LOGF( "%s: aborting; stream version too new!", __func__ );
}
return success;
} /* game_makeFromStream */

2
common/memstream.c
View file

@ -285,7 +285,7 @@ mem_stream_putBits( XWStreamCtxt* p_sctx, XP_U16 nBits, XP_U32 data
XP_ASSERT( data == 0 ); /* otherwise nBits was too small */
#ifdef DEBUG
if ( data != 0 ) {
XP_LOGF( "%s: nBits was %d from line %d, %s", __FUNCTION__,
XP_LOGF( "%s: nBits was %d from line %d, %s", __func__,
origBits, lin, fil );
}
#endif

2
common/server.c
View file

@ -1853,7 +1853,7 @@ reflectMove( ServerCtxt* server, XWStreamCtxt* stream )
handleIllegalWord( server, stream );
}
} else {
XP_LOGF( "%s: dropping move: state=%s", __FUNCTION__,
XP_LOGF( "%s: dropping move: state=%s", __func__,
getStateStr(server->nv.gameState ) );
}
return moveOk;

4
dawg/dict2dawg.cpp
View file

@ -323,7 +323,7 @@ addNodes( NodeList& newedgesR )
}
#ifdef DEBUG
if ( gDebug ) {
fprintf( stderr, "%s => %d\n", __FUNCTION__, found );
fprintf( stderr, "%s => %d\n", __func__, found );
}
#endif
return found;
@ -544,7 +544,7 @@ readOneWord( char* wordBuf, int bufLen, int* lenp, bool* gotEOF )
// if ( NULL != result ) {
// char buf[MAX_WORD_LEN+1];
// fprintf( stderr, "%s returning %s\n", __FUNCTION__,
// fprintf( stderr, "%s returning %s\n", __func__,
// tileToAscii( buf, sizeof(buf), result ) );
// }
return result;

2
linux/cursesmain.c
View file

@ -747,7 +747,7 @@ blocking_gotEvent( CursesAppGlobals* globals, int* ch )
/* stdin first */
if ( (globals->fdArray[FD_STDIN].revents & POLLIN) != 0 ) {
int evtCh = fgetc(stdin);
XP_LOGF( "%s: got key: %x", __FUNCTION__, evtCh );
XP_LOGF( "%s: got key: %x", __func__, evtCh );
*ch = evtCh;
result = XP_TRUE;
--numEvents;

8
linux/gtkmain.c
View file

@ -1081,7 +1081,7 @@ setCtrlsForTray( GtkAppGlobals* globals )
}
globals->adjustment->page_size = pageSize;
XP_LOGF( "%s: set pageSize = %d", __FUNCTION__,
XP_LOGF( "%s: set pageSize = %d", __func__,
pageSize );
globals->adjustment->value =
@ -1362,7 +1362,7 @@ gtk_util_userError( XW_UtilCtxt* uc, UtilErrID id )
XP_Bool silent;
XP_UCHAR* message = linux_getErrString( id, &silent );
XP_LOGF( "%s(%d)", __FUNCTION__, id );
XP_LOGF( "%s(%d)", __func__, id );
if ( silent ) {
XP_LOGF( message );
@ -1577,7 +1577,7 @@ newConnectionInput( GIOChannel *source,
int sock = g_io_channel_unix_get_fd( source );
GtkAppGlobals* globals = (GtkAppGlobals*)data;
XP_LOGF( "%s:condition = 0x%x", __FUNCTION__, (int)condition );
XP_LOGF( "%s:condition = 0x%x", __func__, (int)condition );
/* XP_ASSERT( sock == globals->cGlobals.socket ); */
@ -1753,7 +1753,7 @@ gtk_socket_acceptor( int listener, Acceptor func, CommonGlobals* globals,
G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI,
acceptorInput, globals );
g_io_channel_unref( channel ); /* only main loop holds it now */
XP_LOGF( "%s: g_io_add_watch(%d) => %d", __FUNCTION__, listener, watch );
XP_LOGF( "%s: g_io_add_watch(%d) => %d", __func__, listener, watch );
XP_ASSERT( NULL == info );
info = XP_MALLOC( globals->params->util->mpool, sizeof(*info) );

2
linux/gtknewgame.c
View file

@ -454,7 +454,7 @@ gtk_newgame_attr_set( void* closure, NewGameAttr attr, NGValue value )
GtkNewGameState* state = (GtkNewGameState*)closure;
if ( attr == NG_ATTR_NPLAYERS ) {
XP_U16 i = value.ng_u16;
XP_LOGF( "%s: setting menu %d", __FUNCTION__, i-1 );
XP_LOGF( "%s: setting menu %d", __func__, i-1 );
gtk_combo_box_set_active( GTK_COMBO_BOX(state->nPlayersCombo), i-1 );
} else if ( attr == NG_ATTR_ROLE ) {
gtk_combo_box_set_active( GTK_COMBO_BOX(state->roleCombo),

24
linux/linuxbt.c
View file

@ -99,7 +99,7 @@ getL2Addr( const CommsAddrRec const* addrP, L2_RF_ADDR* const saddr )
// connect to the SDP server running on the remote machine
session = sdp_connect( BDADDR_ANY, &target, 0 );
if ( NULL == session ) {
XP_LOGF( "%s: sdp_connect->%s", __FUNCTION__, strerror(errno) );
XP_LOGF( "%s: sdp_connect->%s", __func__, strerror(errno) );
} else {
sdp_uuid128_create( &svc_uuid, &svc_uuid_int );
search_list = sdp_list_append( 0, &svc_uuid );
@ -172,7 +172,7 @@ lbt_connectSocket( LinBtStuff* btStuff, const CommsAddrRec* addrP )
#endif
);
if ( sock < 0 ) {
XP_LOGF( "%s: socket->%s", __FUNCTION__, strerror(errno) );
XP_LOGF( "%s: socket->%s", __func__, strerror(errno) );
} else {
L2_RF_ADDR saddr;
XP_MEMSET( &saddr, 0, sizeof(saddr) );
@ -185,7 +185,7 @@ lbt_connectSocket( LinBtStuff* btStuff, const CommsAddrRec* addrP )
-1, sock, &btStuff->sockStorage );
btStuff->socket = sock;
} else {
XP_LOGF( "%s: connect->%s; closing socket %d", __FUNCTION__, strerror(errno), sock );
XP_LOGF( "%s: connect->%s; closing socket %d", __func__, strerror(errno), sock );
close( sock );
}
}
@ -216,7 +216,7 @@ lbt_accept( int listener, void* ctxt )
XP_ASSERT( btStuff->socket == -1 );
btStuff->socket = sock;
} else {
XP_LOGF( "%s: accept->%s", __FUNCTION__, strerror(errno) );
XP_LOGF( "%s: accept->%s", __func__, strerror(errno) );
}
return success;
} /* lbt_accept */
@ -284,7 +284,7 @@ lbt_register( LinBtStuff* btStuff, unsigned short l2_psm, uint8_t rc_channel )
// and disconnect
session = sdp_connect( BDADDR_ANY, BDADDR_LOCAL, SDP_RETRY_IF_BUSY );
if ( NULL == session ) {
XP_LOGF( "%s: sdp_connect->%s", __FUNCTION__, strerror(errno) );
XP_LOGF( "%s: sdp_connect->%s", __func__, strerror(errno) );
}
XP_ASSERT( NULL != session );
sdp_record_register( session, &record, 0 );
@ -329,7 +329,7 @@ lbt_listenerSetup( CommonGlobals* globals )
saddr.l2_bdaddr = *BDADDR_ANY;
saddr.l2_psm = htobs( XW_PSM ); /* need to associate uuid with this before opening? */
if ( 0 != bind( listener, (struct sockaddr *)&saddr, sizeof(saddr) ) ) {
XP_LOGF( "%s: bind->%s", __FUNCTION__, strerror(errno) );
XP_LOGF( "%s: bind->%s", __func__, strerror(errno) );
}
#elif defined BT_USE_RFCOMM
saddr.rc_family = AF_BLUETOOTH;
@ -424,7 +424,7 @@ linux_bt_send( const XP_U8* buf, XP_U16 buflen,
XP_S16 nSent = -1;
LinBtStuff* btStuff;
XP_LOGF( "%s(len=%d)", __FUNCTION__, buflen );
XP_LOGF( "%s(len=%d)", __func__, buflen );
LOG_HEX( buf, buflen, __func__ );
btStuff = globals->btStuff;
@ -447,15 +447,15 @@ linux_bt_send( const XP_U8* buf, XP_U16 buflen,
#endif
nSent = write( btStuff->socket, buf, buflen );
if ( nSent < 0 ) {
XP_LOGF( "%s: send->%s", __FUNCTION__, strerror(errno) );
XP_LOGF( "%s: send->%s", __func__, strerror(errno) );
} else if ( nSent < buflen ) {
XP_LOGF( "%s: sent only %d bytes of %d", __FUNCTION__, nSent,
XP_LOGF( "%s: sent only %d bytes of %d", __func__, nSent,
buflen );
/* Need to loop until sent if this is happening */
XP_ASSERT( 0 );
}
} else {
XP_LOGF( "%s: socket still not set", __FUNCTION__ );
XP_LOGF( "%s: socket still not set", __func__ );
}
}
LOG_RETURNF( "%d", nSent );
@ -470,7 +470,7 @@ read_all( int sock, unsigned char* buf, const int len )
while ( totalRead < len ) {
int nRead = read( sock, buf+totalRead, len-totalRead );
if ( nRead < 0 ) {
XP_LOGF( "%s: read->%s", __FUNCTION__, strerror(errno) );
XP_LOGF( "%s: read->%s", __func__, strerror(errno) );
break;
}
totalRead += nRead;
@ -497,7 +497,7 @@ linux_bt_receive( int sock, XP_U8* buf, XP_U16 buflen )
#else
nRead = read( sock, buf, buflen );
if ( nRead < 0 ) {
XP_LOGF( "%s: read->%s", __FUNCTION__, strerror(errno) );
XP_LOGF( "%s: read->%s", __func__, strerror(errno) );
}
#endif

2
linux/linuxmain.c
View file

@ -777,7 +777,7 @@ nameToBtAddr( const char* name, bdaddr_t* ba )
if ( 0 == strcmp( buf, name ) ) {
XP_MEMCPY( ba, &inqInfo[i].bdaddr, sizeof(*ba) );
success = XP_TRUE;
XP_LOGF( "%s: matched %s", __FUNCTION__, name );
XP_LOGF( "%s: matched %s", __func__, name );
char addrStr[32];
ba2str(ba, addrStr);
XP_LOGF( "bt_addr is %s", addrStr );

4
palm/connsdlg.c
View file

@ -112,7 +112,7 @@ stateFromCtls( ConnsDlgState* state )
sizeof(addr->u.bt.hostName) );
XP_MEMCPY( &addr->u.bt.btAddr, &state->btAddr,
sizeof(addr->u.bt.btAddr) );
LOG_HEX( &addr->u.bt.btAddr, sizeof(addr->u.bt.btAddr), __FUNCTION__ );
LOG_HEX( &addr->u.bt.btAddr, sizeof(addr->u.bt.btAddr), __func__ );
#endif
}
} /* stateFromCtls */
@ -215,7 +215,7 @@ browseForDeviceName( PalmAppGlobals* globals, ConnsDlgState* state )
CtlSetLabel( getActiveObjectPtr( XW_CONNS_BT_HOSTTRIGGER_ID ),
state->btName );
XP_MEMCPY( &state->btAddr, &btAddr, sizeof(state->btAddr) );
LOG_HEX( &state->btAddr, sizeof(state->btAddr), __FUNCTION__ );
LOG_HEX( &state->btAddr, sizeof(state->btAddr), __func__ );
}
} /* browseForDeviceName */
#endif

2
palm/newgame.c
View file

@ -661,7 +661,7 @@ handleRemoteChanged( PalmNewGameState* state, XP_U16 controlID, XP_Bool on )
XP_U16 player;
NGValue value;
XP_LOGF( "%s: controlID=%d", __FUNCTION__, controlID );
XP_LOGF( "%s: controlID=%d", __func__, controlID );
player = palmPlayerFromID( controlID, XW_REMOTE_1_CHECKBOX_ID );
value.ng_bool = on;

32
palm/palmbt.c
View file

@ -129,9 +129,9 @@ typedef struct PalmBTStuff {
#ifdef DEBUG
static void palm_bt_log( const char* btfunc, const char* func, Err err );
#define LOG_ERR(f,e) palm_bt_log( #f, __FUNCTION__, e )
#define LOG_ERR(f,e) palm_bt_log( #f, __func__, e )
#define CALL_ERR(e,f,...) \
XP_LOGF( "%s: calling %s", __FUNCTION__, #f ); \
XP_LOGF( "%s: calling %s", __func__, #f ); \
e = f(__VA_ARGS__); \
LOG_ERR(f,e); \
if ( e == btLibErrFailed ) { XP_WARNF( "%s=>btLibErrFailed", #f ); }
@ -163,7 +163,7 @@ static void pbt_killLinks( PalmBTStuff* btStuff, BtLibSocketRef sock );
static XP_Bool pbt_checkAddress( PalmBTStuff* btStuff, const CommsAddrRec* addr );
static void pbt_setstate( PalmBTStuff* btStuff, PBT_STATE newState,
const char* whence );
#define SET_STATE(b,s) pbt_setstate((b),(s),__FUNCTION__)
#define SET_STATE(b,s) pbt_setstate((b),(s),__func__)
#define GET_STATE(b) ((b)->p_connState)
#ifdef DEBUG
@ -270,7 +270,7 @@ palm_bt_close( PalmAppGlobals* globals )
XP_FREE( globals->mpool, btStuff );
globals->btStuff = NULL;
} else {
XP_LOGF( "%s: btStuff null", __FUNCTION__ );
XP_LOGF( "%s: btStuff null", __func__ );
}
} /* palm_bt_close */
@ -360,7 +360,7 @@ palm_bt_browse_device( PalmAppGlobals* globals, XP_BtAddr* btAddr,
XP_ASSERT( sizeof(*btAddr) >= sizeof(addr) );
XP_MEMCPY( btAddr, &addr, sizeof(addr) );
LOG_HEX( &addr, sizeof(addr), __FUNCTION__ );
LOG_HEX( &addr, sizeof(addr), __func__ );
CALL_ERR( err, BtLibGetRemoteDeviceName, btStuff->btLibRefNum,
&addr, &nameType, btLibCachedThenRemote );
@ -472,7 +472,7 @@ palm_bt_send( const XP_U8* buf, XP_U16 len, const CommsAddrRec* addr,
PalmBTStuff* btStuff;
CommsAddrRec remoteAddr;
PBT_PicoRole picoRole;
XP_LOGF( "%s(len=%d)", __FUNCTION__, len);
XP_LOGF( "%s(len=%d)", __func__, len);
btStuff = pbt_checkInit( globals, userCancelled );
if ( !!btStuff ) {
@ -483,7 +483,7 @@ palm_bt_send( const XP_U8* buf, XP_U16 len, const CommsAddrRec* addr,
XP_ASSERT( !!addr );
picoRole = btStuff->picoRole;
XP_LOGF( "%s: role=%s", __FUNCTION__, proleToString(picoRole) );
XP_LOGF( "%s: role=%s", __func__, proleToString(picoRole) );
if ( picoRole == PBT_UNINIT ) {
XP_Bool amMaster = comms_getIsServer( globals->game.comms );
picoRole = amMaster? PBT_MASTER : PBT_SLAVE;
@ -678,7 +678,7 @@ pbt_do_work( PalmBTStuff* btStuff, BtCbEvtProc proc )
XP_MEMCPY( &btStuff->actQueue[0], &btStuff->actQueue[1],
btStuff->queueLen * sizeof(btStuff->actQueue[0]) );
XP_LOGF( "%s: evt=%s; state=%s", __FUNCTION__, actToStr(act),
XP_LOGF( "%s: evt=%s; state=%s", __func__, actToStr(act),
stateToStr(GET_STATE(btStuff)) );
switch( act ) {
@ -813,7 +813,7 @@ pbt_postpone( PalmBTStuff* btStuff, PBT_ACTION act )
EventType eventToPost;
eventToPost.eType = nilEvent;
XP_LOGF( "%s(%s)", __FUNCTION__, actToStr(act) );
XP_LOGF( "%s(%s)", __func__, actToStr(act) );
EvtAddEventToQueue( &eventToPost );
if ( DUPLICATES_OK(act)
@ -885,11 +885,11 @@ pbt_enqueue( PBT_queue* queue, const XP_U8* data, const XP_S16 len,
}
XP_MEMCPY( &queue->bufs[total], data, len );
/* XP_LOGF( "%s: adding %d; total now %d (%d packets)",
__FUNCTION__, */
__func__, */
/* len, len+total, i+1 ); */
result = len;
} else {
XP_LOGF( "%s: dropping packet of len %d", __FUNCTION__, len );
XP_LOGF( "%s: dropping packet of len %d", __func__, len );
result = -1;
}
return result;
@ -973,7 +973,7 @@ bpd_discover( PalmBTStuff* btStuff, BtLibDeviceAddressType* addr )
static void
pbt_setup_slave( PalmBTStuff* btStuff, const CommsAddrRec* addr )
{
XP_LOGF( "%s; state=%s", __FUNCTION__, stateToStr(GET_STATE(btStuff)));
XP_LOGF( "%s; state=%s", __func__, stateToStr(GET_STATE(btStuff)));
if ( btStuff->picoRole == PBT_MASTER ) {
pbt_takedown_master( btStuff );
@ -987,7 +987,7 @@ pbt_setup_slave( PalmBTStuff* btStuff, const CommsAddrRec* addr )
BtLibAddrBtdToA( btStuff->btLibRefNum,
(BtLibDeviceAddressType*)&addr->u.bt.btAddr,
buf, sizeof(buf) ) ) {
XP_LOGF( "%s(%s)", __FUNCTION__, buf );
XP_LOGF( "%s(%s)", __func__, buf );
}
} else {
XP_LOGF( "null addr" );
@ -996,7 +996,7 @@ pbt_setup_slave( PalmBTStuff* btStuff, const CommsAddrRec* addr )
if ( GET_STATE(btStuff) == PBTST_NONE ) {
pbt_postpone( btStuff, PBT_ACT_CONNECT_ACL );
} else {
XP_LOGF( "%s: doing nothing", __FUNCTION__ );
XP_LOGF( "%s: doing nothing", __func__ );
}
LOG_RETURN_VOID();
} /* pbt_setup_slave */
@ -1180,7 +1180,7 @@ socketCallback( BtLibSocketEventType* sEvent, UInt32 refCon )
BtLibSocketEventEnum event = sEvent->event;
Err err;
XP_LOGF( "%s(%s); status:%s", __FUNCTION__, btEvtToStr(event),
XP_LOGF( "%s(%s); status:%s", __func__, btEvtToStr(event),
btErrToStr(sEvent->status) );
switch( event ) {
@ -1314,7 +1314,7 @@ libMgmtCallback( BtLibManagementEventType* mEvent, UInt32 refCon )
{
PalmBTStuff* btStuff = (PalmBTStuff*)refCon;
BtLibManagementEventEnum event = mEvent->event;
XP_LOGF( "%s(%s); status=%s", __FUNCTION__, mgmtEvtToStr(event),
XP_LOGF( "%s(%s); status=%s", __func__, mgmtEvtToStr(event),
btErrToStr(mEvent->status) );
switch( event ) {

2
palm/palmdbg.c
View file

@ -213,7 +213,7 @@ frmObjId_2str( XP_U16 id )
CASESTR( XW_HINTCONFIG_MINSELECTOR_ID );
CASESTR( XW_HINTCONFIG_OK_ID );
CASESTR( XW_HINTCONFIG_CANCEL_ID );
default: return FUNC(__FUNCTION__) " unknown";
default: return FUNC(__func__) " unknown";
}
}

4
palm/palmmain.c
View file

@ -2235,7 +2235,7 @@ handleFocusEvent( PalmAppGlobals* globals, const EventType* event,
== &event->data.frmObjectFocusLost.objectID );
take = event->eType == frmObjectFocusTakeEvent;
/* XP_LOGF( "%s(%s,%s)", __FUNCTION__, frmObjId_2str(objectID), */
/* XP_LOGF( "%s(%s,%s)", __func__, frmObjId_2str(objectID), */
/* (take? "take":"lost") ); */
if ( take && !globals->initialTakeDropped &&
@ -3638,7 +3638,7 @@ palm_util_userError( XW_UtilCtxt* uc, UtilErrID id )
break;
}
XP_LOGF( "%s(%d)", __FUNCTION__, strID );
XP_LOGF( "%s(%d)", __func__, strID );
XP_ASSERT( strID < STR_LAST_STRING );
globals = (PalmAppGlobals*)uc->closure;

4
palm/palmutil.c
View file

@ -148,7 +148,7 @@ disOrEnableTri( FormPtr form, UInt16 id, XP_TriEnable enable )
case frmLabelObj: /* what to do? */
break;
default:
XP_WARNF( "%s: %d not handled", __FUNCTION__, (XP_U16)typ );
XP_WARNF( "%s: %d not handled", __func__, (XP_U16)typ );
XP_ASSERT(0);
}
}
@ -750,7 +750,7 @@ deleteDB( const char* dbName )
Err err = DmDeleteDatabase( CARD_0, dbID );
XP_ASSERT( errNone == err );
} else {
XP_WARNF( "%s(%s): got back 0", __FUNCTION__, dbName );
XP_WARNF( "%s(%s): got back 0", __func__, dbName );
}
} /* deleteDB */

2
palm/prefsdlg.c
View file

@ -416,7 +416,7 @@ checkPrefsHiliteGadget( PalmAppGlobals* globals, UInt16 selGadget )
Boolean result = false;
XP_Bool globalChosen = selGadget == XW_PREFS_ALLGAMES_GADGET_ID;
XP_LOGF( "%s: selGadget=%d", __FUNCTION__, selGadget );
XP_LOGF( "%s: selGadget=%d", __func__, selGadget );
result = globalChosen != globals->prefsDlgState->stateTypeIsGlobal;

2
palm/xptypes.h
View file

@ -82,7 +82,7 @@ XP_U8* palm_realloc(XP_U8* in, XP_U16 size);
#define XP_ABS(a) ((a)>=0?(a):-(a))
#ifdef DEBUG
#define XP_ASSERT(b) palm_assert(b, __LINE__, __FUNCTION__, __FILE__)
#define XP_ASSERT(b) palm_assert(b, __LINE__, __func__, __FILE__)
#else
#define XP_ASSERT(b)
#endif

2
wince/ceclrsel.c
View file

@ -306,7 +306,7 @@ wrapChooseColor( ColorsDlgState* cState, HWND owner, XP_U16 button )
DeleteObject( cState->brushes[index] );
cState->brushes[index] = CreateSolidBrush( clrref );
XP_LOGF( "%s: may need to invalidate the button since color's changed",
__FUNCTION__ );
__func__ );
}
#else
CHOOSECOLOR ccs;

2
wince/cedict.c
View file

@ -94,7 +94,7 @@ ce_dictionary_make( CEAppGlobals* globals, XP_UCHAR* dictName )
XP_U8 nodeSize;
flags = n_ptr_tohs( &ptr );
XP_DEBUGF( "%s: flags=0x%x", __FUNCTION__, flags );
XP_DEBUGF( "%s: flags=0x%x", __func__, flags );
#ifdef NODE_CAN_4
if ( flags == 0x0002 ) {

6
wince/ceginfo.c
View file

@ -177,7 +177,7 @@ loadFromGameInfo( HWND hDlg, CEAppGlobals* globals, GameInfoState* giState )
#ifndef STUBBED_DICT
if ( !!gi->dictName ) {
XP_LOGF( "%s: copying %s to giState->newDictName",
__FUNCTION__, gi->dictName );
__func__, gi->dictName );
XP_MEMCPY( giState->newDictName, gi->dictName,
(XP_U16)XP_STRLEN(gi->dictName)+1 );
}
@ -445,7 +445,7 @@ playerFromID( XP_U16 id, XP_U16 base )
{
XP_U16 player;
player = (id - base) / NUM_COLS;
/* XP_LOGF( "%s: looks like row %d", __FUNCTION__, player ); */
/* XP_LOGF( "%s: looks like row %d", __func__, player ); */
return player;
}
@ -489,7 +489,7 @@ GameInfo(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
/* { */
/* char buf[64]; */
/* messageToBuf( message, buf, sizeof(buf) ); */
/* XP_LOGF( "%s: %s", __FUNCTION__, buf ); */
/* XP_LOGF( "%s: %s", __func__, buf ); */
/* } */
/* #endif */

10
wince/cemain.c
View file

@ -1228,9 +1228,9 @@ ceSetDictName( const wchar_t* XP_UNUSED(wPath), XP_U16 XP_UNUSED_DBG(index),
/* WideCharToMultiByte( CP_ACP, 0, wPath, -1, */
/* buf, sizeof(buf)-1, NULL, NULL ); */
/* XP_LOGF( "%s: got path \"%s\"", __FUNCTION__, buf ); */
/* XP_LOGF( "%s: got path \"%s\"", __func__, buf ); */
/* str = copyString( MPPARM(globals->mpool) buf ); */
/* XP_LOGF( "%s: got %p", __FUNCTION__, str ); /\* this is leaking *\/ */
/* XP_LOGF( "%s: got %p", __func__, str ); /\* this is leaking *\/ */
/* XP_ASSERT( NULL == globals->gameInfo.dictName ); */
/* globals->gameInfo.dictName = str; */
return XP_FALSE;
@ -1327,7 +1327,7 @@ drawInsidePaint( CEAppGlobals* globals )
hdc = GetDC( globals->hWnd );
if ( !hdc ) {
logLastError( __FUNCTION__ );
logLastError( __func__ );
} else {
HDC prevHDC = globals->hdc;
globals->hdc = hdc;
@ -1823,7 +1823,7 @@ ceHandleFocusKey( CEAppGlobals* globals, WPARAM wParam, XP_Bool* handledP )
XP_Key key;
XP_S16 incr = 0;
XP_LOGF( "%s: 0x%x", __FUNCTION__, wParam );
XP_LOGF( "%s: 0x%x", __func__, wParam );
switch ( wParam ) {
/* get constants for these!!! */
@ -2553,7 +2553,7 @@ ce_util_userError( XW_UtilCtxt* uc, UtilErrID id )
#endif
default:
XP_LOGF( "%s(%d)", __FUNCTION__, id );
XP_LOGF( "%s(%d)", __func__, id );
message = "unknown errorcode ID!!!";
break;
}