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

This commit is contained in:
Eric House 2013-08-08 01:07:02 -07:00
commit 9528e61f84

View file

@ -875,9 +875,9 @@ DBMgr::StoreMessage( const char* const connName, int hid,
{
DevIDRelay devID = getDevID( connName, hid );
if ( DEVID_NONE == devID ) {
logf( XW_LOGINFO, "%s: devid not found for connName=%s, hid=%d; "
"dropping message", __func__, connName, hid );
} else {
logf( XW_LOGERROR, "%s: warning: devid not found for connName=%s, "
"hid=%d", __func__, connName, hid );
}
size_t newLen;
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() );
execSql( query );
}
}
void
DBMgr::decodeMessage( PGresult* result, bool useB64, int rowIndx, int b64indx,