pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-30 15:26:38 +02:00
Code Activity

Merge branch '2.0' into 2.1.

Browse Source
This commit is contained in:
Sadie Powell
2022-01-04 00:39:07 +00:00
parent db6b2225b1 a93a7c87b6
commit c9f93eeaed
6 changed files with 397 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/encryption/enc_sha256.cpp
-1
View File
@@ -55,7 +55,6 @@ static const unsigned SHA256_BLOCK_SIZE = 512 / 8;
inline static uint32_t SHFR(uint32_t x, uint32_t n) { return x >> n; }
inline static uint32_t ROTR(uint32_t x, uint32_t n) { return (x >> n) | (x << ((sizeof(x) << 3) - n)); }
inline static uint32_t ROTL(uint32_t x, uint32_t n) { return (x << n) | (x >> ((sizeof(x) << 3) - n)); }
inline static uint32_t CH(uint32_t x, uint32_t y, uint32_t z) { return (x & y) ^ (~x & z); }
inline static uint32_t MAJ(uint32_t x, uint32_t y, uint32_t z) { return (x & y) ^ (x & z) ^ (y & z); }
modules/m_xmlrpc_main.cpp
+6 -2
View File
@@ -253,9 +253,13 @@ class MyXMLRPCEvent : public XMLRPCEvent
{
OperType *ot = Config->MyOperTypes[i];
Anope::string perms;
for (std::list<Anope::string>::const_iterator it2 = ot->GetPrivs().begin(), it2_end = ot->GetPrivs().end(); it2 != it2_end; ++it2)
std::list<Anope::string> privs = ot->GetPrivs();
for (std::list<Anope::string>::const_iterator it2 = privs.begin(), it2_end = privs.end(); it2 != it2_end; ++it2)
perms += " " + *it2;
for (std::list<Anope::string>::const_iterator it2 = ot->GetCommands().begin(), it2_end = ot->GetCommands().end(); it2 != it2_end; ++it2)
std::list<Anope::string> commands = ot->GetCommands();
for (std::list<Anope::string>::const_iterator it2 = commands.begin(), it2_end = commands.end(); it2 != it2_end; ++it2)
perms += " " + *it2;
request.reply(ot->GetName(), perms);
}
modules/protocol/inspircd.cpp
+1 -1
View File
@@ -76,7 +76,7 @@ class InspIRCdProto : public IRCDProto
MaxLine = 4096;
}
unsigned GetMaxListFor(Channel *c, ChannelMode *cm)
unsigned GetMaxListFor(Channel *c, ChannelMode *cm) override
{
ListLimits *limits = maxlist.Get(c);
if (limits)