Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-05 20:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

add local variable to prevent some dereferencing

Browse source
This commit is contained in:
Eric House 2014-12-10 07:48:38 -08:00
parent 9ff7cd1ff9
commit 68441c60f6
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
xwords4/relay/dbmgr.cpp
View file

@ -897,6 +897,8 @@ DBMgr::getDevID( const DevID* devID )
{ {
DevIDRelay rDevID = DEVID_NONE; DevIDRelay rDevID = DEVID_NONE;
DevIDType devIDType = devID->m_devIDType; DevIDType devIDType = devID->m_devIDType;
const string& devIDString = devID->m_devIDString;
StrWPF query; StrWPF query;
assert( ID_TYPE_NONE < devIDType ); assert( ID_TYPE_NONE < devIDType );
if ( ID_TYPE_RELAY == devIDType ) { if ( ID_TYPE_RELAY == devIDType ) {
@ -906,11 +908,11 @@ DBMgr::getDevID( const DevID* devID )
const char* fmt = "SELECT id FROM " DEVICES_TABLE " WHERE id=%d"; const char* fmt = "SELECT id FROM " DEVICES_TABLE " WHERE id=%d";
query.catf( fmt, cur ); query.catf( fmt, cur );
} }
} else if ( 0 < devID->m_devIDString.size() ) { } else if ( 0 < devIDString.size() ) {
query.catf( "SELECT id FROM " DEVICES_TABLE query.catf( "SELECT id FROM " DEVICES_TABLE
" WHERE devtypes[1]=%d and devids[1] = '%s'" " WHERE devtypes[1]=%d and devids[1] = '%s'"
" ORDER BY ctime DESC LIMIT 1", " ORDER BY ctime DESC LIMIT 1",
devIDType, devID->m_devIDString.c_str() ); devIDType, devIDString.c_str() );
} }
if ( 0 < query.size() ) { if ( 0 < query.size() ) {
@ -923,8 +925,8 @@ DBMgr::getDevID( const DevID* devID )
} }
PQclear( result ); PQclear( result );
} }
logf( XW_LOGINFO, "%s(in=%s)=>%d (0x%.8X)", __func__, logf( XW_LOGINFO, "%s(in='%s')=>%d (0x%.8X)", __func__,
devID->m_devIDString.c_str(), rDevID, rDevID ); devIDString.c_str(), rDevID, rDevID );
return rDevID; return rDevID;
} }