diff options
| -rw-r--r-- | src/cmd_whowas.cpp | 5 | ||||
| -rw-r--r-- | src/dnsqueue.cpp | 2 | ||||
| -rw-r--r-- | src/helperfuncs.cpp | 2 | ||||
| -rw-r--r-- | src/users.cpp | 11 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/cmd_whowas.cpp b/src/cmd_whowas.cpp index b710b5a08..e1c783f00 100644 --- a/src/cmd_whowas.cpp +++ b/src/cmd_whowas.cpp @@ -73,11 +73,12 @@ void cmd_whowas::Handle (char **parameters, int pcnt, userrec* user) } else { - whowas_set* grp = (whowas_set*)i; + whowas_set* grp = (whowas_set*)i->second; if (grp->size()) { - for (whowas_set::iterator u = grp->begin(); u != grp->end(); u++) + for (whowas_set::iterator ux = grp->begin(); ux != grp->end(); ux++) { + WhoWasGroup* u = (WhoWasGroup*)*ux; time_t rawtime = u->signon; tm *timeinfo; char b[MAXBUF]; diff --git a/src/dnsqueue.cpp b/src/dnsqueue.cpp index 8be3ea99b..6d62b7ede 100644 --- a/src/dnsqueue.cpp +++ b/src/dnsqueue.cpp @@ -53,8 +53,6 @@ using namespace std; extern ServerConfig* Config; extern InspIRCd* ServerInstance; -address_cache addrcache; - class Lookup; Lookup* dnslist[MAX_DESCRIPTORS]; diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 82ee5c148..1062e14ef 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -1494,7 +1494,7 @@ bool DirValid(char* dirandfile) if( getcwd( otherdir, MAXBUF ) == NULL ) return false; chdir(buffer); - int t = strlen(work); + size_t t = strlen(work); if (strlen(otherdir) >= t) { otherdir[t] = '\0'; diff --git a/src/users.cpp b/src/users.cpp index a50787a17..83800e01d 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -515,12 +515,13 @@ void AddWhoWas(userrec* u) } else { - if (iter->size() > 10) + whowas_set* group = (whowas_set*)iter->second; + if (group->size() > 10) { - iter->pop_front(); + group->pop_front(); } WhoWasGroup *a = new WhoWasGroup(u); - iter->push_back(a); + group->push_back(a); } } @@ -529,10 +530,10 @@ void MaintainWhoWas(time_t TIME) { for (whowas_users::iterator iter = whowas.begin(); iter != whowas.end(); iter++) { - whowas_set* n = (whowas_set*)iter; + whowas_set* n = (whowas_set*)iter->second; if (n->size()) { - while ((n->begin() != n->end()) && (n->begin()->signon < TIME - 259200)) // 3 days + while ((n->begin() != n->end()) && ((*n->begin())->signon < TIME - 259200)) // 3 days { WhoWasGroup *a = *(n->begin()); delete a; |