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

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

Browse source
This commit is contained in:
Eric House 2013-01-22 06:54:42 -08:00
commit 8c0984fb7a
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/relay/dbmgr.cpp
View file

@ -814,14 +814,14 @@ DBMgr::StoreMessage( const char* const connName, int hid,
} }
void void
decodeMessage( PGresult* result, bool useB64, int b64indx, int byteaIndex, DBMgr::decodeMessage( PGresult* result, bool useB64, int b64indx, int byteaIndex,
unsigned char* buf, size_t* buflen ) unsigned char* buf, size_t* buflen )
{ {
const char* from = NULL; const char* from = NULL;
if ( useB64 ) { if ( useB64 ) {
from = PQgetvalue( result, 0, b64indx ); from = PQgetvalue( result, 0, b64indx );
} }
if ( NULL == from ) { if ( NULL == from || '\0' == from[0] ) {
useB64 = false; useB64 = false;
from = PQgetvalue( result, 0, byteaIndex ); from = PQgetvalue( result, 0, byteaIndex );
} }

2
xwords4/relay/dbmgr.h
View file

@ -123,6 +123,8 @@ class DBMgr {
DevIDRelay getDevID( const DevID* devID ); DevIDRelay getDevID( const DevID* devID );
int getCountWhere( const char* table, string& test ); int getCountWhere( const char* table, string& test );
void RemoveStoredMessages( string& msgIDs ); void RemoveStoredMessages( string& msgIDs );
void decodeMessage( PGresult* result, bool useB64, int b64indx,
int byteaIndex, unsigned char* buf, size_t* buflen );
PGconn* getThreadConn( void ); PGconn* getThreadConn( void );