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

Fixed bug #1349 (m_sqlite compiles without error under FreeBSD), as well as use C99's stdint.h (or cstdint if available) to get (u)intX_t types instead of our stupid typedefs. pstdint.h included in case there is no cstdint or stdint.h available.

Browse Source
This commit is contained in:
Naram Qashat
2011-10-24 16:32:29 -04:00
parent d0513d6506
commit 377a7a968b
24 changed files with 221 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+3 -12
View File
@@ -248,7 +248,7 @@ else(MSVC)
if(UNIX)
set(CXXFLAGS "${CXXFLAGS} -ansi -pedantic")
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CXXFLAGS "${CXXFLAGS} -fno-leading-underscore")
set(CXXFLAGS "${CXXFLAGS} -Wno-long-long -fno-leading-underscore")
endif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
# If we aren't on a *nix system, we are using MinGW
else(UNIX)
@@ -329,7 +329,8 @@ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINF
endif(CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINFO")
# Check for the existance of the following include files
check_include_file(sys/types.h HAVE_SYS_TYPES_H)
check_include_file(cstdint HAVE_CSTDINT)
check_include_file(stdint.h HAVE_STDINT_H)
check_include_file(strings.h HAVE_STRINGS_H)
# Check for the existance of the following functions
@@ -341,16 +342,6 @@ check_function_exists(epoll_wait HAVE_EPOLL)
check_function_exists(poll HAVE_POLL)
check_function_exists(kqueue HAVE_KQUEUE)
# Check for the existance of the following types
check_type_size(uint8_t UINT8_T)
check_type_size(u_int8_t U_INT8_T)
check_type_size(int16_t INT16_T)
check_type_size(uint16_t UINT16_T)
check_type_size(u_int16_t U_INT16_T)
check_type_size(int32_t INT32_T)
check_type_size(uint32_t UINT32_T)
check_type_size(u_int32_t U_INT32_T)
# Check if eventfd works
try_run(EVENTFD_TEST_RUN_RESULT EVENTFD_TEST_COMPILE_RESULT ${CMAKE_CURRENT_BINARY_DIR} ${Anope_SOURCE_DIR}/cmake/eventfd_test.cpp)
set(HAVE_EVENTFD FALSE)
include/account.h
+1 -1
View File
@@ -158,7 +158,7 @@ class CoreExport NickCore : public Extensible, public Flags<NickCoreFlag, NI_END
Oper *o;
/* Unsaved data */
uint16 channelcount; /* Number of channels currently registered */
uint16_t channelcount; /* Number of channels currently registered */
time_t lastmail; /* Last time this nick record got a mail */
std::list<NickAlias *> aliases; /* List of aliases */
include/bots.h
+1 -1
View File
@@ -35,7 +35,7 @@ static const Anope::string BotFlagString[] = { "BEGIN", "CORE", "PRIVATE", "CONF
class CoreExport BotInfo : public User, public Flags<BotFlag, BI_END>, public Serializable<BotInfo>
{
public:
uint32 chancount;
uint32_t chancount;
time_t created; /* Birth date ;) */
time_t lastmsg; /* Last time we said something */
typedef Anope::insensitive_map<CommandInfo> command_map;
include/channels.h
+4 -4
View File
@@ -43,7 +43,7 @@ class CoreExport Channel : public Extensible, public Flags<ChannelFlag, 3>
/** A map of channel modes with their parameters set on this channel
*/
ModeList modes;
public:
/** Default constructor
* @param name The channel name
@@ -68,9 +68,9 @@ class CoreExport Channel : public Extensible, public Flags<ChannelFlag, 3>
time_t server_modetime; /* Time of last server MODE */
time_t chanserv_modetime; /* Time of last check_modes() */
int16 server_modecount; /* Number of server MODEs this second */
int16 chanserv_modecount; /* Number of check_mode()'s this sec */
int16 bouncy_modes; /* Did we fail to set modes here? */
int16_t server_modecount; /* Number of server MODEs this second */
int16_t chanserv_modecount; /* Number of check_mode()'s this sec */
int16_t bouncy_modes; /* Did we fail to set modes here? */
/** Call if we need to unset all modes and clear all user status (internally).
* Only useful if we get a SJOIN with a TS older than what we have here
include/extern.h
+6 -6
View File
@@ -171,8 +171,8 @@ E bool nickIsServices(const Anope::string &nick, bool bot);
E void add_entropy_userkeys();
E void rand_init();
E unsigned char getrandom8();
E uint16 getrandom16();
E uint32 getrandom32();
E uint16_t getrandom16();
E uint32_t getrandom32();
E std::list<Anope::string> BuildStringList(const Anope::string &, char = ' ');
E std::vector<Anope::string> BuildStringVector(const Anope::string &, char = ' ');
@@ -208,14 +208,14 @@ E void notice_server(const Anope::string &source, const Server *s, const char *f
/**** sockets.cpp ****/
E int32 TotalRead;
E int32 TotalWritten;
E int32_t TotalRead;
E int32_t TotalWritten;
E SocketIO normalSocketIO;
/**** users.c ****/
E int32 opcnt;
E uint32 maxusercnt, usercnt;
E int32_t opcnt;
E uint32_t maxusercnt, usercnt;
E time_t maxusertime;
E User *finduser(const Anope::string &nick);
include/modules.h
+1 -1
View File
@@ -594,7 +594,7 @@ class CoreExport Module : public Extensible
* @param priv The privilege changed
* @param what The new level
*/
virtual void OnLevelChange(User *u, ChannelInfo *ci, const Anope::string &priv, int16 what) { }
virtual void OnLevelChange(User *u, ChannelInfo *ci, const Anope::string &priv, int16_t what) { }
/** Called when a channel is dropped
* @param chname The channel name
include/regchannel.h
+10 -10
View File
@@ -152,7 +152,7 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag,
std::vector<ChanAccess *> access; /* List of authorized users */
std::vector<AutoKick *> akick; /* List of users to kickban */
std::vector<BadWord *> badwords; /* List of badwords */
std::map<Anope::string, int16> levels;
std::map<Anope::string, int16_t> levels;
public:
typedef std::multimap<ChannelModeName, ModeLock> ModeList;
@@ -184,7 +184,7 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag,
Anope::string last_topic_setter; /* Setter */
time_t last_topic_time; /* Time */
int16 bantype;
int16_t bantype;
MemoInfo memos;
@@ -193,11 +193,11 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag,
/* For BotServ */
BotInfo *bi; /* Bot used on this channel */
Flags<BotServFlag> botflags;
int16 ttb[TTB_SIZE]; /* Times to ban for each kicker */
int16_t ttb[TTB_SIZE]; /* Times to ban for each kicker */
int16 capsmin, capspercent; /* For CAPS kicker */
int16 floodlines, floodsecs; /* For FLOOD kicker */
int16 repeattimes; /* For REPEAT kicker */
int16_t capsmin, capspercent; /* For CAPS kicker */
int16_t floodlines, floodsecs; /* For FLOOD kicker */
int16_t repeattimes; /* For REPEAT kicker */
serialized_data serialize();
static void unserialize(serialized_data &);
@@ -377,7 +377,7 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag,
ModeLock *GetMLock(ChannelModeName mname, const Anope::string &param = "");
/** Get the current mode locks as a string
* @param complete True to show mlock parameters aswell
* @param complete True to show mlock parameters aswell
* @return A string of mode locks, eg: +nrt
*/
Anope::string GetMLockAsString(bool complete) const;
@@ -393,7 +393,7 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag,
* the new topic in the ChannelInfo
*/
void CheckTopic();
/** Restore the channel topic, used on channel creation when not syncing with the uplink
* and after uplink sync
*/
@@ -404,13 +404,13 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag,
* @return the level
* @throws CoreException if priv is not a valid privilege
*/
int16 GetLevel(const Anope::string &priv);
int16_t GetLevel(const Anope::string &priv);
/** Set the level for a privilege
* @param priv The privilege priv
* @param level The new level
*/
void SetLevel(const Anope::string &priv, int16 level);
void SetLevel(const Anope::string &priv, int16_t level);
/** Remove a privilege from the channel
* @param priv The privilege
include/services.h
+1 -1
View File
@@ -551,7 +551,7 @@ class CoreExport Memo : public Flags<MemoFlag>, public Serializable<Memo>
struct CoreExport MemoInfo
{
int16 memomax;
int16_t memomax;
std::vector<Memo *> memos;
std::vector<Anope::string> ignores;
include/sysconf.h.cmake
+9 -77
View File
File diff suppressed because it is too large Load Diff
modules/commands/bs_kick.cpp
+22 -22
View File
File diff suppressed because it is too large Load Diff
modules/commands/cs_access.cpp
+5 -5
View File
@@ -19,12 +19,12 @@ enum
ACCESS_FOUNDER = 10001
};
static std::map<Anope::string, int16, std::less<ci::string> > defaultLevels;
static std::map<Anope::string, int16_t, std::less<ci::string> > defaultLevels;
static void reset_levels(ChannelInfo *ci)
{
ci->ClearLevels();
for (std::map<Anope::string, int16, std::less<ci::string> >::iterator it = defaultLevels.begin(), it_end = defaultLevels.end(); it != it_end; ++it)
for (std::map<Anope::string, int16_t, std::less<ci::string> >::iterator it = defaultLevels.begin(), it_end = defaultLevels.end(); it != it_end; ++it)
ci->SetLevel(it->first, it->second);
}
@@ -286,7 +286,7 @@ class CommandCSAccess : public Command
Anope::string mask = params[2];
int level = ACCESS_INVALID;
try
{
level = convertTo<int>(params[3]);
@@ -736,7 +736,7 @@ class CommandCSLevels : public Command
for (unsigned i = 0; i < privs.size(); ++i)
{
const Privilege &p = privs[i];
int16 j = ci->GetLevel(p.name);
int16_t j = ci->GetLevel(p.name);
if (j == ACCESS_INVALID)
source.Reply(_(" %-*s (disabled)"), levelinfo_maxwidth, p.name.c_str());
@@ -918,7 +918,7 @@ class CSAccess : public Module
if (group->ci == NULL)
return EVENT_CONTINUE;
/* Special case. Allows a level of < 0 to match anyone, and a level of 0 to match anyone identified. */
int16 level = group->ci->GetLevel(priv);
int16_t level = group->ci->GetLevel(priv);
if (level < 0)
return EVENT_ALLOW;
else if (level == 0 && group->nc)
modules/commands/cs_set_bantype.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ class CommandCSSetBanType : public Command
try
{
int16 new_type = convertTo<int16>(params[1]);
int16_t new_type = convertTo<int16_t>(params[1]);
if (new_type < 0 || new_type > 3)
throw ConvertException("Invalid range");
ci->bantype = new_type;
modules/commands/ms_set.cpp
+3 -3
View File
@@ -75,7 +75,7 @@ class CommandMSSet : public Command
Anope::string p2 = params.size() > 2 ? params[2] : "";
Anope::string p3 = params.size() > 3 ? params[3] : "";
Anope::string user, chan;
int16 limit;
int16_t limit;
NickCore *nc = u->Account();
ChannelInfo *ci = NULL;
bool is_servadmin = u->HasPriv("memoserv/set-limit");
@@ -136,7 +136,7 @@ class CommandMSSet : public Command
limit = -1;
try
{
limit = convertTo<int16>(p1);
limit = convertTo<int16_t>(p1);
}
catch (const ConvertException &) { }
}
@@ -160,7 +160,7 @@ class CommandMSSet : public Command
limit = -1;
try
{
limit = convertTo<int16>(p1);
limit = convertTo<int16_t>(p1);
}
catch (const ConvertException &) { }
/* The first character is a digit, but we could still go negative
modules/database/db_old.cpp
+49 -49
View File
File diff suppressed because it is too large Load Diff
modules/database/db_plain.cpp
+22 -22
View File
File diff suppressed because it is too large Load Diff
modules/database/db_sql_live_read.cpp
+1 -1
View File
@@ -303,7 +303,7 @@ class DBMySQL : public Module
this->OnAccessDel(ci, NULL, ci->GetAccess(i));
}
void OnLevelChange(User *u, ChannelInfo *ci, const Anope::string &priv, int16 what)
void OnLevelChange(User *u, ChannelInfo *ci, const Anope::string &priv, int16_t what)
{
this->Insert(ci->serialize_name(), ci->serialize());
}
modules/database/db_sql_live_write.cpp
+5 -5
View File
@@ -63,11 +63,11 @@ static void ChanInfoUpdate(const Anope::string &name, const SQLResult &res)
bi->Assign(NULL, ci);
}
ci->capsmin = convertTo<int16>(res.Get(0, "capsmin"));
ci->capspercent = convertTo<int16>(res.Get(0, "capspercent"));
ci->floodlines = convertTo<int16>(res.Get(0, "floodlines"));
ci->floodsecs = convertTo<int16>(res.Get(0, "floodsecs"));
ci->repeattimes = convertTo<int16>(res.Get(0, "repeattimes"));
ci->capsmin = convertTo<int16_t>(res.Get(0, "capsmin"));
ci->capspercent = convertTo<int16_t>(res.Get(0, "capspercent"));
ci->floodlines = convertTo<int16_t>(res.Get(0, "floodlines"));
ci->floodsecs = convertTo<int16_t>(res.Get(0, "floodsecs"));
ci->repeattimes = convertTo<int16_t>(res.Get(0, "repeattimes"));
if (ci->c)
check_modes(ci->c);
modules/encryption/enc_sha1.cpp
+18 -18
View File
@@ -18,27 +18,27 @@ A million repetitions of "a"
struct SHA1_CTX
{
uint32 state[5];
uint32 count[2];
uint32_t state[5];
uint32_t count[2];
unsigned char buffer[64];
};
void SHA1Transform(uint32 state[5], const unsigned char buffer[64]);
void SHA1Transform(uint32_t state[5], const unsigned char buffer[64]);
void SHA1Init(SHA1_CTX *context);
void SHA1Update(SHA1_CTX *context, const unsigned char *data, uint32 len);
void SHA1Update(SHA1_CTX *context, const unsigned char *data, uint32_t len);
void SHA1Final(unsigned char digest[20], SHA1_CTX *context);
inline static uint32 rol(uint32 value, uint32 bits) { return (value << bits) | (value >> (32 - bits)); }
inline static uint32_t rol(uint32_t value, uint32_t bits) { return (value << bits) | (value >> (32 - bits)); }
union CHAR64LONG16
{
unsigned char c[64];
uint32 l[16];
uint32_t l[16];
};
/* blk0() and blk() perform the initial expand. */
/* I got the idea of expanding during the round function from SSLeay */
inline static uint32 blk0(CHAR64LONG16 *block, uint32 i)
inline static uint32_t blk0(CHAR64LONG16 *block, uint32_t i)
{
#ifdef LITTLE_ENDIAN
return block->l[i] = (rol(block->l[i], 24) & 0xFF00FF00) | (rol(block->l[i], 8) & 0x00FF00FF);
@@ -46,20 +46,20 @@ inline static uint32 blk0(CHAR64LONG16 *block, uint32 i)
return block->l[i];
#endif
}
inline static uint32 blk(CHAR64LONG16 *block, uint32 i) { return block->l[i & 15] = rol(block->l[(i + 13) & 15] ^ block->l[(i + 8) & 15] ^ block->l[(i + 2) & 15] ^ block->l[i & 15],1); }
inline static uint32_t blk(CHAR64LONG16 *block, uint32_t i) { return block->l[i & 15] = rol(block->l[(i + 13) & 15] ^ block->l[(i + 8) & 15] ^ block->l[(i + 2) & 15] ^ block->l[i & 15],1); }
/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
inline static void R0(CHAR64LONG16 *block, uint32 v, uint32 &w, uint32 x, uint32 y, uint32 &z, uint32 i) { z += ((w & (x ^ y)) ^ y) + blk0(block, i) + 0x5A827999 + rol(v, 5); w = rol(w, 30); }
inline static void R1(CHAR64LONG16 *block, uint32 v, uint32 &w, uint32 x, uint32 y, uint32 &z, uint32 i) { z += ((w & (x ^ y)) ^ y) + blk(block, i) + 0x5A827999 + rol(v, 5); w = rol(w, 30); }
inline static void R2(CHAR64LONG16 *block, uint32 v, uint32 &w, uint32 x, uint32 y, uint32 &z, uint32 i) { z += (w ^ x ^ y) + blk(block, i) + 0x6ED9EBA1 + rol(v, 5); w = rol(w, 30); }
inline static void R3(CHAR64LONG16 *block, uint32 v, uint32 &w, uint32 x, uint32 y, uint32 &z, uint32 i) { z += (((w | x) & y) | (w & x)) + blk(block, i) + 0x8F1BBCDC + rol(v, 5); w = rol(w, 30); }
inline static void R4(CHAR64LONG16 *block, uint32 v, uint32 &w, uint32 x, uint32 y, uint32 &z, uint32 i) { z += (w ^ x ^ y) + blk(block, i) + 0xCA62C1D6 + rol(v, 5); w = rol(w, 30); }
inline static void R0(CHAR64LONG16 *block, uint32_t v, uint32_t &w, uint32_t x, uint32_t y, uint32_t &z, uint32_t i) { z += ((w & (x ^ y)) ^ y) + blk0(block, i) + 0x5A827999 + rol(v, 5); w = rol(w, 30); }
inline static void R1(CHAR64LONG16 *block, uint32_t v, uint32_t &w, uint32_t x, uint32_t y, uint32_t &z, uint32_t i) { z += ((w & (x ^ y)) ^ y) + blk(block, i) + 0x5A827999 + rol(v, 5); w = rol(w, 30); }
inline static void R2(CHAR64LONG16 *block, uint32_t v, uint32_t &w, uint32_t x, uint32_t y, uint32_t &z, uint32_t i) { z += (w ^ x ^ y) + blk(block, i) + 0x6ED9EBA1 + rol(v, 5); w = rol(w, 30); }
inline static void R3(CHAR64LONG16 *block, uint32_t v, uint32_t &w, uint32_t x, uint32_t y, uint32_t &z, uint32_t i) { z += (((w | x) & y) | (w & x)) + blk(block, i) + 0x8F1BBCDC + rol(v, 5); w = rol(w, 30); }
inline static void R4(CHAR64LONG16 *block, uint32_t v, uint32_t &w, uint32_t x, uint32_t y, uint32_t &z, uint32_t i) { z += (w ^ x ^ y) + blk(block, i) + 0xCA62C1D6 + rol(v, 5); w = rol(w, 30); }
/* Hash a single 512-bit block. This is the core of the algorithm. */
void SHA1Transform(uint32 state[5], const unsigned char buffer[64])
void SHA1Transform(uint32_t state[5], const unsigned char buffer[64])
{
uint32 a, b, c, d, e;
uint32_t a, b, c, d, e;
static unsigned char workspace[64];
CHAR64LONG16 *block = reinterpret_cast<CHAR64LONG16 *>(workspace);
memcpy(block, buffer, 64);
@@ -115,9 +115,9 @@ void SHA1Init(SHA1_CTX *context)
/* Run your data through this. */
void SHA1Update(SHA1_CTX *context, const unsigned char *data, uint32 len)
void SHA1Update(SHA1_CTX *context, const unsigned char *data, uint32_t len)
{
uint32 i, j;
uint32_t i, j;
j = (context->count[0] >> 3) & 63;
if ((context->count[0] += len << 3) < (len << 3))
@@ -140,7 +140,7 @@ void SHA1Update(SHA1_CTX *context, const unsigned char *data, uint32 len)
void SHA1Final(unsigned char digest[21], SHA1_CTX *context)
{
uint32 i;
uint32_t i;
unsigned char finalcount[8];
for (i = 0; i < 8; ++i)
modules/encryption/enc_sha256.cpp
+21 -21
View File
@@ -65,41 +65,41 @@ class SHA256Context
unsigned tot_len;
unsigned len;
unsigned char block[2 * SHA256_BLOCK_SIZE];
uint32 h[8];
uint32_t h[8];
};
inline static uint32 SHFR(uint32 x, uint32 n) { return x >> n; }
inline static uint32 ROTR(uint32 x, uint32 n) { return (x >> n) | (x << ((sizeof(x) << 3) - n)); }
inline static uint32 ROTL(uint32 x, uint32 n) { return (x << n) | (x >> ((sizeof(x) << 3) - n)); }
inline static uint32 CH(uint32 x, uint32 y, uint32 z) { return (x & y) ^ (~x & z); }
inline static uint32 MAJ(uint32 x, uint32 y, uint32 z) { return (x & y) ^ (x & z) ^ (y & z); }
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); }
inline static uint32 SHA256_F1(uint32 x) { return ROTR(x, 2) ^ ROTR(x, 13) ^ ROTR(x, 22); }
inline static uint32 SHA256_F2(uint32 x) { return ROTR(x, 6) ^ ROTR(x, 11) ^ ROTR(x, 25); }
inline static uint32 SHA256_F3(uint32 x) { return ROTR(x, 7) ^ ROTR(x, 18) ^ SHFR(x, 3); }
inline static uint32 SHA256_F4(uint32 x) { return ROTR(x, 17) ^ ROTR(x, 19) ^ SHFR(x, 10); }
inline static uint32_t SHA256_F1(uint32_t x) { return ROTR(x, 2) ^ ROTR(x, 13) ^ ROTR(x, 22); }
inline static uint32_t SHA256_F2(uint32_t x) { return ROTR(x, 6) ^ ROTR(x, 11) ^ ROTR(x, 25); }
inline static uint32_t SHA256_F3(uint32_t x) { return ROTR(x, 7) ^ ROTR(x, 18) ^ SHFR(x, 3); }
inline static uint32_t SHA256_F4(uint32_t x) { return ROTR(x, 17) ^ ROTR(x, 19) ^ SHFR(x, 10); }
inline static void UNPACK32(unsigned x, unsigned char *str)
{
str[3] = static_cast<uint8>(x);
str[2] = static_cast<uint8>(x >> 8);
str[1] = static_cast<uint8>(x >> 16);
str[0] = static_cast<uint8>(x >> 24);
str[3] = static_cast<uint8_t>(x);
str[2] = static_cast<uint8_t>(x >> 8);
str[1] = static_cast<uint8_t>(x >> 16);
str[0] = static_cast<uint8_t>(x >> 24);
}
inline static void PACK32(unsigned char *str, uint32 &x)
inline static void PACK32(unsigned char *str, uint32_t &x)
{
x = static_cast<uint32>(str[3]) | static_cast<uint32>(str[2]) << 8 | static_cast<uint32>(str[1]) << 16 | static_cast<uint32>(str[0]) << 24;
x = static_cast<uint32_t>(str[3]) | static_cast<uint32_t>(str[2]) << 8 | static_cast<uint32_t>(str[1]) << 16 | static_cast<uint32_t>(str[0]) << 24;
}
/* Macros used for loops unrolling */
inline static void SHA256_SCR(uint32 w[64], int i)
inline static void SHA256_SCR(uint32_t w[64], int i)
{
w[i] = SHA256_F4(w[i - 2]) + w[i - 7] + SHA256_F3(w[i - 15]) + w[i - 16];
}
uint32 sha256_k[64] =
uint32_t sha256_k[64] =
{
0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
@@ -163,7 +163,7 @@ class ESHA256 : public Module
void SHA256Transform(SHA256Context *ctx, unsigned char *message, unsigned block_nb)
{
uint32 w[64], wv[8];
uint32_t w[64], wv[8];
unsigned char *sub_block;
for (unsigned i = 1; i <= block_nb; ++i)
{
@@ -178,8 +178,8 @@ class ESHA256 : public Module
wv[j] = ctx->h[j];
for (j = 0; j < 64; ++j)
{
uint32 t1 = wv[7] + SHA256_F2(wv[4]) + CH(wv[4], wv[5], wv[6]) + sha256_k[j] + w[j];
uint32 t2 = SHA256_F1(wv[0]) + MAJ(wv[0], wv[1], wv[2]);
uint32_t t1 = wv[7] + SHA256_F2(wv[4]) + CH(wv[4], wv[5], wv[6]) + sha256_k[j] + w[j];
uint32_t t2 = SHA256_F1(wv[0]) + MAJ(wv[0], wv[1], wv[2]);
wv[7] = wv[6];
wv[6] = wv[5];
wv[5] = wv[4];
modules/extra/m_sqlite.cpp
+4 -4
View File
@@ -147,15 +147,15 @@ SQLResult SQLiteService::RunQuery(const SQLQuery &query)
int err = sqlite3_prepare_v2(this->sql, real_query.c_str(), real_query.length(), &stmt, NULL);
if (err != SQLITE_OK)
return SQLiteResult(query, real_query, sqlite3_errmsg(this->sql));
std::vector<Anope::string> columns;
int cols = sqlite3_column_count(stmt);
columns.resize(cols);
for (int i = 0; i < cols; ++i)
columns[i] = sqlite3_column_name(stmt, i);
SQLiteResult result(query, real_query);
do
{
err = sqlite3_step(stmt);
@@ -175,7 +175,7 @@ SQLResult SQLiteService::RunQuery(const SQLQuery &query)
if (err != SQLITE_DONE)
return SQLiteResult(query, real_query, sqlite3_errmsg(this->sql));
return result;
}
src/misc.cpp
+11 -11
View File
@@ -29,9 +29,9 @@ void ExtensibleItem::OnDelete()
struct arc4_stream
{
uint8 i;
uint8 j;
uint8 s[256];
uint8_t i;
uint8_t j;
uint8_t s[256];
} rs;
/*************************************************************************/
@@ -325,7 +325,7 @@ bool IsValidIdent(const Anope::string &ident)
else
return false;
}
return true;
}
@@ -337,12 +337,12 @@ bool IsValidHost(const Anope::string &host)
{
if (host.empty() || host.length() > Config->HostLen)
return false;
if (Config->VhostDisallowBE.find_first_of(host[0]) != Anope::string::npos)
return false;
else if (Config->VhostDisallowBE.find_first_of(host[host.length() - 1]) != Anope::string::npos)
return false;
int dots = 0;
for (unsigned i = 0; i < host.length(); ++i)
{
@@ -459,7 +459,7 @@ static void arc4_addrandom(void *dat, int datlen)
for (int n = 0; n < 256; ++n)
{
++rs.i;
uint8 si = rs.s[rs.i];
uint8_t si = rs.s[rs.i];
rs.j = rs.j + si + (static_cast<unsigned char *>(dat))[n % datlen];
rs.s[rs.i] = rs.s[rs.j];
rs.s[rs.j] = si;
@@ -545,9 +545,9 @@ unsigned char getrandom8()
* Get the random numbers 16 byte deep
* @return char
*/
uint16 getrandom16()
uint16_t getrandom16()
{
uint16 val = getrandom8() << 8;
uint16_t val = getrandom8() << 8;
val |= getrandom8();
return val;
}
@@ -558,9 +558,9 @@ uint16 getrandom16()
* Get the random numbers 32 byte deep
* @return char
*/
uint32 getrandom32()
uint32_t getrandom32()
{
uint32 val = getrandom8() << 24;
uint32_t val = getrandom8() << 24;
val |= getrandom8() << 16;
val |= getrandom8() << 8;
val |= getrandom8();
src/regchannel.cpp
+15 -15
View File
File diff suppressed because it is too large Load Diff
src/sockets.cpp
+4 -4
View File
@@ -2,8 +2,8 @@
std::map<int, Socket *> SocketEngine::Sockets;
int32 TotalRead = 0;
int32 TotalWritten = 0;
int32_t TotalRead = 0;
int32_t TotalWritten = 0;
SocketIO normalSocketIO;
@@ -232,7 +232,7 @@ bool cidr::match(sockaddrs &other)
default:
throw SocketException("Invalid address type");
}
if (memcmp(ip, their_ip, byte))
return false;
@@ -241,7 +241,7 @@ bool cidr::match(sockaddrs &other)
byte = this->cidr_len % 8;
if ((*ip & byte) != (*their_ip & byte))
return false;
return true;
}
src/users.cpp
+4 -4
View File
@@ -15,8 +15,8 @@
Anope::insensitive_map<User *> UserListByNick;
Anope::map<User *> UserListByUID;
int32 opcnt = 0;
uint32 usercnt = 0, maxusercnt = 0;
int32_t opcnt = 0;
uint32_t usercnt = 0, maxusercnt = 0;
time_t maxusertime;
/*************************************************************************/
@@ -478,7 +478,7 @@ bool User::IsServicesOper()
if (match == false)
return false;
}
EventReturn MOD_RESULT;
FOREACH_RESULT(I_IsServicesOper, IsServicesOper(this));
if (MOD_RESULT == EVENT_STOP)
@@ -843,7 +843,7 @@ User *do_nick(const Anope::string &source, const Anope::string &nick, const Anop
if (user->server && user->server->IsULined())
exempt = true;
FOREACH_MOD(I_OnUserConnect, OnUserConnect(user, exempt));
return user;
}
else