Mirrors/privacore-open-source-search-engine
1
0
Fork 1
mirror of https://github.com/privacore/open-source-search-engine.git synced 2025-07-14 02:36:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Encapsulate Msge0 better

Browse Source
This commit is contained in:
Ivan Skytte Jørgensen
2016-11-17 11:21:57 +01:00
parent 5a596df57d
commit 1a0062a726
3 changed files with 14 additions and 10 deletions

4
Msge0.cpp

@ -4,8 +4,6 @@
#include "ip.h"
static void gotTagRecWrapper ( void *state ) ;
Msge0::Msge0() {
m_slabNum = -1;
m_buf = NULL;
@ -274,7 +272,7 @@ bool Msge0::sendMsg8a ( int32_t i ) {
return doneSending ( i );
}
static void gotTagRecWrapper ( void *state ) {
void Msge0::gotTagRecWrapper(void *state) {
Msg8a *m = (Msg8a *)state;
//TagRec *m = (TagRec *)state;
Msge0 *THIS = (Msge0 *)m->m_state2;

8
Msge0.h

@ -28,8 +28,14 @@ public:
void *state ,
void (*callback)(void *state) ) ;
TagRec *getTagRec ( int32_t i ) { return m_tagRecPtrs[i]; }
TagRec *getTagRec(int32_t i) { return m_tagRecPtrs[i]; }
const TagRec *getTagRec(int32_t i) const { return m_tagRecPtrs[i]; }
int32_t getErrno() const { return m_errno; }
TagRec ***getTagRecPtrsPtr() { return &m_tagRecPtrs; } //XmlDoc needs this due to ptr-ptr idiocy
private:
static void gotTagRecWrapper(void *state);
bool launchRequests ( int32_t starti ) ;
bool sendMsg8a ( int32_t i );
bool doneSending ( int32_t i );

12
XmlDoc.cpp

@ -10688,8 +10688,8 @@ TagRec ***XmlDoc::getOutlinkTagRecVector () {
}
// error?
if ( m_outlinkTagRecVectorValid && m_msge0.m_errno ) {
g_errno = m_msge0.m_errno;
if ( m_outlinkTagRecVectorValid && m_msge0.getErrno() ) {
g_errno = m_msge0.getErrno();
logTrace( g_conf.m_logTraceXmlDoc, "END, g_errno %" PRId32, g_errno);
return NULL;
}
@ -10698,7 +10698,7 @@ TagRec ***XmlDoc::getOutlinkTagRecVector () {
if ( m_outlinkTagRecVectorValid )
{
logTrace( g_conf.m_logTraceXmlDoc, "END, already valid (and not fake IPs)" );
return &m_msge0.m_tagRecPtrs;
return m_msge0.getTagRecPtrsPtr();
}
Links *links = getLinks();
@ -10777,8 +10777,8 @@ TagRec ***XmlDoc::getOutlinkTagRecVector () {
}
// or this?
if ( m_msge0.m_errno ) {
g_errno = m_msge0.m_errno;
if ( m_msge0.getErrno() ) {
g_errno = m_msge0.getErrno();
logTrace( g_conf.m_logTraceXmlDoc, "END, m_msge0.m_errno=%" PRId32, g_errno);
return NULL;
}
@ -10786,7 +10786,7 @@ TagRec ***XmlDoc::getOutlinkTagRecVector () {
//m_outlinkTagRecVector = m_msge0.m_tagRecPtrs;
// ptr to a list of ptrs to tag recs
logTrace( g_conf.m_logTraceXmlDoc, "END, got list" );
return &m_msge0.m_tagRecPtrs;
return m_msge0.getTagRecPtrsPtr();
}