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

Merge remote-tracking branch 'origin/android_branch' into android_branch

Browse source
This commit is contained in:
Eric House 2013-08-08 01:07:02 -07:00
commit 9528e61f84
1 changed files with 28 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
xwords4/relay/dbmgr.cpp
View file

@ -875,9 +875,9 @@ DBMgr::StoreMessage( const char* const connName, int hid,
{ {
DevIDRelay devID = getDevID( connName, hid ); DevIDRelay devID = getDevID( connName, hid );
if ( DEVID_NONE == devID ) { if ( DEVID_NONE == devID ) {
logf( XW_LOGINFO, "%s: devid not found for connName=%s, hid=%d; " logf( XW_LOGERROR, "%s: warning: devid not found for connName=%s, "
"dropping message", __func__, connName, hid ); "hid=%d", __func__, connName, hid );
} else { }
size_t newLen; size_t newLen;
const char* fmt = "INSERT INTO " MSGS_TABLE " " const char* fmt = "INSERT INTO " MSGS_TABLE " "
@ -905,7 +905,6 @@ DBMgr::StoreMessage( const char* const connName, int hid,
logf( XW_LOGINFO, "%s: query: %s", __func__, query.c_str() ); logf( XW_LOGINFO, "%s: query: %s", __func__, query.c_str() );
execSql( query ); execSql( query );
} }
}
void void
DBMgr::decodeMessage( PGresult* result, bool useB64, int rowIndx, int b64indx, DBMgr::decodeMessage( PGresult* result, bool useB64, int rowIndx, int b64indx,