Remove unused timestamp variable from SiteGetter::getSite

This commit is contained in:
Ai Lin Chia
2018-02-12 17:18:47 +01:00
parent df926b24b2
commit 0b8eed9f78
9 changed files with 12 additions and 14 deletions

@ -4109,9 +4109,9 @@ bool Links::addLink(const char *link, int32_t linkLen, int32_t nodeNum,
// same site?
if (m_parentUrl) {
SiteGetter parentSiteGetter;
parentSiteGetter.getSite(m_parentUrl->getUrl(), nullptr, 0, 0, 0);
parentSiteGetter.getSite(m_parentUrl->getUrl(), nullptr, 0, 0);
SiteGetter siteGetter;
siteGetter.getSite(url.getUrl(), nullptr, 0, 0, 0);
siteGetter.getSite(url.getUrl(), nullptr, 0, 0);
if (strcmp(siteGetter.getSite(), parentSiteGetter.getSite()) == 0) {
flags |= LF_SAMESITE;

@ -135,7 +135,7 @@ bool Msge1::launchRequests ( int32_t starti ) {
const char *site = gr->getString("site");
if (site != nullptr) {
SiteGetter sg;
sg.getSite(m_urlPtrs[m_n], nullptr, 0, 0, m_niceness);
sg.getSite(m_urlPtrs[m_n], nullptr, 0, m_niceness);
if (strcmp(site, sg.getSite()) != 0) {
SafeBuf sb;

@ -110,7 +110,7 @@ static bool getLinkdbRecs(State *st) {
u.set(st->m_url_str, strlen(st->m_url_str), false, false);
SiteGetter sg;
sg.getSite(st->m_url_str, NULL, 0, 0, 0);
sg.getSite(st->m_url_str, NULL, 0, 0);
uint32_t h32 = hash32(sg.getSite(), sg.getSiteLen(), 0);
key224_t startKey = Linkdb::makeStartKey_uk(h32, u.getUrlHash64());

@ -99,7 +99,7 @@ SiteGetter::~SiteGetter ( ) {
// pass a bunch of site ptrs to msg9a
// . "url" MUST BE NORMALIZED via Url.cpp. so using Links' buffer is ok!
// . TODO: consider setting "state" to null if your url host has tons of inlinx
bool SiteGetter::getSite ( const char *url, TagRec *gr, int32_t timestamp, collnum_t collnum, int32_t niceness,
bool SiteGetter::getSite ( const char *url, TagRec *gr, collnum_t collnum, int32_t niceness,
void *state, void (* callback)(void *) ) {
// save it
m_url = url;

@ -18,7 +18,7 @@ public:
// . returns false if blocked, true otherwise
// . sets g_errno on erorr
bool getSite ( const char *url, class TagRec *gr, int32_t timestamp, collnum_t collnum, int32_t niceness,
bool getSite ( const char *url, class TagRec *gr, collnum_t collnum, int32_t niceness,
void *state = NULL, void (* callback)(void *) = NULL ) ;
const char *getSite() const { return m_site; }

@ -763,7 +763,7 @@ bool TagRec::setFromHttpRequest ( HttpRequest *r, TcpSocket *s ) {
url.set(urlPtr);
SiteGetter sg;
sg.getSite(url.getUrl(), NULL, 0, 0, 0);
sg.getSite(url.getUrl(), NULL, 0, 0);
// . add to tag rdb recs in safebuf
// . this pushes the rdbid as first byte
@ -1277,7 +1277,7 @@ bool Msg8a::getTagRec( Url *url, collnum_t collnum, int32_t niceness, void *stat
// . if site was NULL that means we guess it. default to hostname
// unless in a recognized for like /~mwells/
SiteGetter sg;
sg.getSite ( url->getUrl(), NULL, 0, collnum, m_niceness );
sg.getSite ( url->getUrl(), NULL, collnum, m_niceness );
// if it set it to a recognized site, like ~mwells, then set "site"
if ( sg.getSiteLen() ) {
site = sg.getSite();

@ -7913,10 +7913,8 @@ char *XmlDoc::getSite ( ) {
return NULL;
}
int32_t timestamp = getSpideredTime();
// do it
if ( ! m_siteGetter.getSite ( f->getUrl(), gr, timestamp, cr->m_collnum, m_niceness, this, gotSiteWrapper )) {
if ( ! m_siteGetter.getSite ( f->getUrl(), gr, cr->m_collnum, m_niceness, this, gotSiteWrapper )) {
// return -1 if we blocked
return (char *) -1;
}
@ -19673,7 +19671,7 @@ SafeBuf *XmlDoc::getNewTagBuf ( ) {
// get the normalized url
char *url = links->getLinkPtr(i);
// get the site. this will not block or have an error.
siteGetter.getSite(url,gr,timestamp,cr->m_collnum,m_niceness);
siteGetter.getSite(url,gr,cr->m_collnum,m_niceness);
// these are now valid and should reference into
// Links::m_buf[]
const char *site = siteGetter.getSite();

@ -5369,7 +5369,7 @@ static void dumpLinkdb(const char *coll, int32_t startFileNum, int32_t numFiles,
u.set( url, strlen( url ), false, false );
SiteGetter sg;
sg.getSite(url, NULL, 0, 0, 0);
sg.getSite(url, NULL, 0, 0);
uint32_t h32 = hash32(sg.getSite(), sg.getSiteLen(), 0);
if( urlhash ) {

@ -3,6 +3,6 @@
TEST(SiteGetterTest, GetSite) {
SiteGetter sg;
EXPECT_TRUE(sg.getSite("http://dr.dk/", NULL, 0, 0, 0));
EXPECT_TRUE(sg.getSite("http://dr.dk/", NULL, 0, 0));
EXPECT_STREQ("www.dr.dk", sg.getSite());
}