mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-06 05:24:46 +01:00
Merge remote-tracking branch 'origin/gtk_multigame' into gtk_multigame
This commit is contained in:
commit
8c0984fb7a
2 changed files with 5 additions and 3 deletions
|
@ -814,14 +814,14 @@ DBMgr::StoreMessage( const char* const connName, int hid,
|
|||
}
|
||||
|
||||
void
|
||||
decodeMessage( PGresult* result, bool useB64, int b64indx, int byteaIndex,
|
||||
unsigned char* buf, size_t* buflen )
|
||||
DBMgr::decodeMessage( PGresult* result, bool useB64, int b64indx, int byteaIndex,
|
||||
unsigned char* buf, size_t* buflen )
|
||||
{
|
||||
const char* from = NULL;
|
||||
if ( useB64 ) {
|
||||
from = PQgetvalue( result, 0, b64indx );
|
||||
}
|
||||
if ( NULL == from ) {
|
||||
if ( NULL == from || '\0' == from[0] ) {
|
||||
useB64 = false;
|
||||
from = PQgetvalue( result, 0, byteaIndex );
|
||||
}
|
||||
|
|
|
@ -123,6 +123,8 @@ class DBMgr {
|
|||
DevIDRelay getDevID( const DevID* devID );
|
||||
int getCountWhere( const char* table, string& test );
|
||||
void RemoveStoredMessages( string& msgIDs );
|
||||
void decodeMessage( PGresult* result, bool useB64, int b64indx,
|
||||
int byteaIndex, unsigned char* buf, size_t* buflen );
|
||||
|
||||
PGconn* getThreadConn( void );
|
||||
|
||||
|
|
Loading…
Reference in a new issue