pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-10 04:23:13 +02:00
Code Activity

Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9

Browse Source
This commit is contained in:
Naram Qashat
2010-07-28 00:28:59 -04:00
parent 4700c96268 a2573a2c30
commit aa9610a56f
51 changed files with 149 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/channels.cpp
+13 -13
View File
@@ -232,7 +232,7 @@ bool Channel::HasUserStatus(User *u, ChannelModeStatus *cms) const
*/
bool Channel::HasUserStatus(User *u, ChannelModeName Name) const
{
return HasUserStatus(u, dynamic_cast<ChannelModeStatus *>(ModeManager::FindChannelModeByName(Name)));
return HasUserStatus(u, debug_cast<ChannelModeStatus *>(ModeManager::FindChannelModeByName(Name)));
}
/**
@@ -298,7 +298,7 @@ void Channel::SetModeInternal(ChannelMode *cm, const Anope::string &param, bool
return;
}
ChannelModeList *cml = dynamic_cast<ChannelModeList *>(cm);
ChannelModeList *cml = debug_cast<ChannelModeList *>(cm);
cml->AddMask(this, param);
return;
}
@@ -357,7 +357,7 @@ void Channel::SetModeInternal(ChannelMode *cm, const Anope::string &param, bool
/* If this is a param mode and its mlocked +, check to ensure someone didn't reset it with the wrong param */
else if (cm->Type == MODE_PARAM && ci->HasMLock(cm->Name, true))
{
ChannelModeParam *cmp = dynamic_cast<ChannelModeParam *>(cm);
ChannelModeParam *cmp = debug_cast<ChannelModeParam *>(cm);
Anope::string cparam, ciparam;
/* Get the param currently set on this channel */
GetParam(cmp->Name, cparam);
@@ -429,7 +429,7 @@ void Channel::RemoveModeInternal(ChannelMode *cm, const Anope::string &param, bo
return;
}
ChannelModeList *cml = dynamic_cast<ChannelModeList *>(cm);
ChannelModeList *cml = debug_cast<ChannelModeList *>(cm);
cml->DelMask(this, param);
return;
}
@@ -509,7 +509,7 @@ void Channel::SetMode(BotInfo *bi, ChannelMode *cm, const Anope::string &param,
else if (cm->Type == MODE_STATUS)
{
User *u = finduser(param);
if (u && HasUserStatus(u, dynamic_cast<ChannelModeStatus *>(cm)))
if (u && HasUserStatus(u, debug_cast<ChannelModeStatus *>(cm)))
return;
}
else if (cm->Type == MODE_LIST)
@@ -562,7 +562,7 @@ void Channel::RemoveMode(BotInfo *bi, ChannelMode *cm, const Anope::string &para
else if (cm->Type == MODE_STATUS)
{
User *u = finduser(param);
if (u && !HasUserStatus(u, dynamic_cast<ChannelModeStatus *>(cm)))
if (u && !HasUserStatus(u, debug_cast<ChannelModeStatus *>(cm)))
return;
}
else if (cm->Type == MODE_LIST)
@@ -574,7 +574,7 @@ void Channel::RemoveMode(BotInfo *bi, ChannelMode *cm, const Anope::string &para
bool SendParam = true;
if (cm->Type == MODE_PARAM)
{
ChannelModeParam *cmp = dynamic_cast<ChannelModeParam *>(cm);
ChannelModeParam *cmp = debug_cast<ChannelModeParam *>(cm);
if (cmp->MinusNoArg)
SendParam = false;
}
@@ -677,7 +677,7 @@ void Channel::ClearBans(BotInfo *bi)
Entry *entry, *nexte;
ChannelModeList *cml;
cml = dynamic_cast<ChannelModeList *>(ModeManager::FindChannelModeByName(CMODE_BAN));
cml = debug_cast<ChannelModeList *>(ModeManager::FindChannelModeByName(CMODE_BAN));
if (cml && this->bans && this->bans->count)
for (entry = this->bans->entries; entry; entry = nexte)
@@ -696,7 +696,7 @@ void Channel::ClearExcepts(BotInfo *bi)
Entry *entry, *nexte;
ChannelModeList *cml;
cml = dynamic_cast<ChannelModeList *>(ModeManager::FindChannelModeByName(CMODE_EXCEPT));
cml = debug_cast<ChannelModeList *>(ModeManager::FindChannelModeByName(CMODE_EXCEPT));
if (cml && this->excepts && this->excepts->count)
for (entry = this->excepts->entries; entry; entry = nexte)
@@ -715,7 +715,7 @@ void Channel::ClearInvites(BotInfo *bi)
Entry *entry, *nexte;
ChannelModeList *cml;
cml = dynamic_cast<ChannelModeList *>(ModeManager::FindChannelModeByName(CMODE_INVITEOVERRIDE));
cml = debug_cast<ChannelModeList *>(ModeManager::FindChannelModeByName(CMODE_INVITEOVERRIDE));
if (cml && this->invites && this->invites->count)
for (entry = this->invites->entries; entry; entry = nexte)
@@ -823,7 +823,7 @@ void ChanSetInternalModes(Channel *c, int ac, const char **av)
}
else if (cm->Type == MODE_PARAM)
{
ChannelModeParam *cmp = dynamic_cast<ChannelModeParam *>(cm);
ChannelModeParam *cmp = debug_cast<ChannelModeParam *>(cm);
if (!add && cmp->MinusNoArg)
{
@@ -927,7 +927,7 @@ Anope::string chan_get_modes(Channel *chan, int complete, int plus)
if ((*it)->Class != MC_CHANNEL)
continue;
ChannelMode *cm = dynamic_cast<ChannelMode *>(*it);
ChannelMode *cm = debug_cast<ChannelMode *>(*it);
if (chan->HasMode(cm->Name))
{
@@ -937,7 +937,7 @@ Anope::string chan_get_modes(Channel *chan, int complete, int plus)
{
if (cm->Type == MODE_PARAM)
{
ChannelModeParam *cmp = dynamic_cast<ChannelModeParam *>(cm);
ChannelModeParam *cmp = debug_cast<ChannelModeParam *>(cm);
if (plus || !cmp->MinusNoArg)
{
src/chanserv.cpp
+2 -2
View File
@@ -160,7 +160,7 @@ Anope::string get_mlock_modes(ChannelInfo *ci, int complete)
if (cm->Type == MODE_PARAM)
{
cmp = dynamic_cast<ChannelModeParam *>(cm);
cmp = debug_cast<ChannelModeParam *>(cm);
ci->GetParam(cmp->Name, param);
@@ -343,7 +343,7 @@ void check_modes(Channel *c)
/* Add the eventual parameter */
if (cm->Type == MODE_PARAM)
{
ChannelModeParam *cmp = dynamic_cast<ChannelModeParam *>(cm);
ChannelModeParam *cmp = debug_cast<ChannelModeParam *>(cm);
if (!cmp->MinusNoArg)
{
src/config.cpp
+12 -12
View File
@@ -838,82 +838,82 @@ int ServerConfig::Read(bool bail)
{
case DT_NOSPACES:
{
ValueContainerString *vcs = dynamic_cast<ValueContainerString *>(Values[Index].val);
ValueContainerString *vcs = debug_cast<ValueContainerString *>(Values[Index].val);
ValidateNoSpaces(vi.GetValue(), Values[Index].tag, Values[Index].value);
vcs->Set(vi.GetValue());
}
break;
case DT_HOSTNAME:
{
ValueContainerString *vcs = dynamic_cast<ValueContainerString *>(Values[Index].val);
ValueContainerString *vcs = debug_cast<ValueContainerString *>(Values[Index].val);
ValidateHostname(vi.GetValue(), Values[Index].tag, Values[Index].value);
vcs->Set(vi.GetValue());
}
break;
case DT_IPADDRESS:
{
ValueContainerString *vcs = dynamic_cast<ValueContainerString *>(Values[Index].val);
ValueContainerString *vcs = debug_cast<ValueContainerString *>(Values[Index].val);
ValidateIP(vi.GetValue(), Values[Index].tag, Values[Index].value, allow_wild);
vcs->Set(vi.GetValue());
}
break;
case DT_CHARPTR:
{
ValueContainerChar *vcc = dynamic_cast<ValueContainerChar *>(Values[Index].val);
ValueContainerChar *vcc = debug_cast<ValueContainerChar *>(Values[Index].val);
// Make sure we also copy the null terminator
vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1);
}
break;
case DT_CSSTRING:
{
ValueContainerCSString *vcs = dynamic_cast<ValueContainerCSString *>(Values[Index].val);
ValueContainerCSString *vcs = debug_cast<ValueContainerCSString *>(Values[Index].val);
vcs->Set(vi.GetCSValue());
}
break;
case DT_CISTRING:
{
ValueContainerCIString *vcs = dynamic_cast<ValueContainerCIString *>(Values[Index].val);
ValueContainerCIString *vcs = debug_cast<ValueContainerCIString *>(Values[Index].val);
vcs->Set(vi.GetCIValue());
}
break;
case DT_STRING:
{
ValueContainerString *vcs = dynamic_cast<ValueContainerString *>(Values[Index].val);
ValueContainerString *vcs = debug_cast<ValueContainerString *>(Values[Index].val);
vcs->Set(vi.GetValue());
}
break;
case DT_INTEGER:
{
int val = vi.GetInteger();
ValueContainerInt *vci = dynamic_cast<ValueContainerInt *>(Values[Index].val);
ValueContainerInt *vci = debug_cast<ValueContainerInt *>(Values[Index].val);
vci->Set(&val, sizeof(int));
}
break;
case DT_UINTEGER:
{
unsigned val = vi.GetInteger();
ValueContainerUInt *vci = dynamic_cast<ValueContainerUInt *>(Values[Index].val);
ValueContainerUInt *vci = debug_cast<ValueContainerUInt *>(Values[Index].val);
vci->Set(&val, sizeof(unsigned));
}
break;
case DT_LUINTEGER:
{
unsigned long val = vi.GetInteger();
ValueContainerLUInt *vci = dynamic_cast<ValueContainerLUInt *>(Values[Index].val);
ValueContainerLUInt *vci = debug_cast<ValueContainerLUInt *>(Values[Index].val);
vci->Set(&val, sizeof(unsigned long));
}
break;
case DT_TIME:
{
time_t time = dotime(vi.GetValue());
ValueContainerTime *vci = dynamic_cast<ValueContainerTime *>(Values[Index].val);
ValueContainerTime *vci = debug_cast<ValueContainerTime *>(Values[Index].val);
vci->Set(&time, sizeof(time_t));
}
break;
case DT_BOOLEAN:
{
bool val = vi.GetBool();
ValueContainerBool *vcb = dynamic_cast<ValueContainerBool *>(Values[Index].val);
ValueContainerBool *vcb = debug_cast<ValueContainerBool *>(Values[Index].val);
vcb->Set(&val, sizeof(bool));
}
break;
src/modes.cpp
+2 -2
View File
@@ -87,7 +87,7 @@ void SetDefaultMLock()
ChannelMode *cm = ModeManager::FindChannelModeByChar(Config.BotModes[i]);
if (cm && cm->Type == MODE_STATUS && std::find(BotModes.begin(), BotModes.end(), cm) == BotModes.end())
BotModes.push_back(dynamic_cast<ChannelModeStatus *>(cm));
BotModes.push_back(debug_cast<ChannelModeStatus *>(cm));
}
}
@@ -730,7 +730,7 @@ char ModeManager::GetStatusChar(char Value)
cm = it->second;
if (cm->Type == MODE_STATUS)
{
cms = dynamic_cast<ChannelModeStatus *>(cm);
cms = debug_cast<ChannelModeStatus *>(cm);
if (Value == cms->Symbol)
return it->first;
src/regchannel.cpp
+3 -3
View File
@@ -352,7 +352,7 @@ void ChannelInfo::LoadMLock()
{
if ((*mit)->Class == MC_CHANNEL)
{
ChannelMode *cm = dynamic_cast<ChannelMode *>(*mit);
ChannelMode *cm = debug_cast<ChannelMode *>(*mit);
if (cm->NameAsString.equals_ci(*it))
this->SetMLock(cm->Name, true);
@@ -371,7 +371,7 @@ void ChannelInfo::LoadMLock()
{
if ((*mit)->Class == MC_CHANNEL)
{
ChannelMode *cm = dynamic_cast<ChannelMode *>(*mit);
ChannelMode *cm = debug_cast<ChannelMode *>(*mit);
if (cm->NameAsString.equals_ci(*it))
this->SetMLock(cm->Name, false);
@@ -392,7 +392,7 @@ void ChannelInfo::LoadMLock()
{
if ((*mit)->Class == MC_CHANNEL)
{
ChannelMode *cm = dynamic_cast<ChannelMode *>(*mit);
ChannelMode *cm = debug_cast<ChannelMode *>(*mit);
if (cm->NameAsString.equals_ci(it->first))
this->SetMLock(cm->Name, true, it->second);