summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/modules/bs_badwords.h2
-rw-r--r--include/modules/bs_kick.h1
-rw-r--r--include/modules/cs_mode.h2
-rw-r--r--include/modules/ns_cert.h1
-rw-r--r--include/modules/redis.h1
-rw-r--r--modules/database/db_old.cpp42
-rw-r--r--modules/database/db_plain.cpp5
7 files changed, 30 insertions, 24 deletions
diff --git a/include/modules/bs_badwords.h b/include/modules/bs_badwords.h
index 8791b8812..8f606818d 100644
--- a/include/modules/bs_badwords.h
+++ b/include/modules/bs_badwords.h
@@ -39,6 +39,8 @@ struct BadWord
struct BadWords
{
+ virtual ~BadWords() { }
+
/** Add a badword to the badword list
* @param word The badword
* @param type The type (SINGLE START END)
diff --git a/include/modules/bs_kick.h b/include/modules/bs_kick.h
index e1c43cc8c..36bb3a67e 100644
--- a/include/modules/bs_kick.h
+++ b/include/modules/bs_kick.h
@@ -41,5 +41,6 @@ struct KickerData
KickerData() { }
public:
+ virtual ~KickerData() { }
virtual void Check(ChannelInfo *ci) = 0;
};
diff --git a/include/modules/cs_mode.h b/include/modules/cs_mode.h
index 6f1aeb643..8ef21ca10 100644
--- a/include/modules/cs_mode.h
+++ b/include/modules/cs_mode.h
@@ -27,6 +27,8 @@ struct ModeLocks
{
typedef std::vector<ModeLock *> ModeList;
+ virtual ~ModeLocks() { }
+
/** Check if a mode is mlocked
* @param mode The mode
* @param An optional param
diff --git a/include/modules/ns_cert.h b/include/modules/ns_cert.h
index 8587cdfb2..a90b6aee3 100644
--- a/include/modules/ns_cert.h
+++ b/include/modules/ns_cert.h
@@ -14,6 +14,7 @@ struct NSCertList
protected:
NSCertList() { }
public:
+ virtual ~NSCertList() { }
/** Add an entry to the nick's certificate list
*
diff --git a/include/modules/redis.h b/include/modules/redis.h
index d13769d91..4cff88e99 100644
--- a/include/modules/redis.h
+++ b/include/modules/redis.h
@@ -48,6 +48,7 @@ namespace Redis
Module *owner;
Interface(Module *m) : owner(m) { }
+ virtual ~Interface() { }
virtual void OnResult(const Reply &r) = 0;
virtual void OnError(const Anope::string &error) { Log(owner) << error; }
diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp
index 10b2d56e7..8ce79f708 100644
--- a/modules/database/db_old.cpp
+++ b/modules/database/db_old.cpp
@@ -447,45 +447,45 @@ static void LoadNicks()
READ(read_string(buffer, f));
nc->Extend<Anope::string>("greet", buffer);
- uint32_t uint;
- READ(read_uint32(&uint, f));
- //nc->icq = uint;
+ uint32_t u32;
+ READ(read_uint32(&u32, f));
+ //nc->icq = u32;
READ(read_string(buffer, f));
//nc->url = buffer;
- READ(read_uint32(&uint, f));
- if (uint & OLD_NI_KILLPROTECT)
+ READ(read_uint32(&u32, f));
+ if (u32 & OLD_NI_KILLPROTECT)
nc->Extend<bool>("KILLPROTECT");
- if (uint & OLD_NI_SECURE)
+ if (u32 & OLD_NI_SECURE)
nc->Extend<bool>("NS_SECURE");
- if (uint & OLD_NI_MSG)
+ if (u32 & OLD_NI_MSG)
nc->Extend<bool>("MSG");
- if (uint & OLD_NI_MEMO_HARDMAX)
+ if (u32 & OLD_NI_MEMO_HARDMAX)
nc->Extend<bool>("MEMO_HARDMAX");
- if (uint & OLD_NI_MEMO_SIGNON)
+ if (u32 & OLD_NI_MEMO_SIGNON)
nc->Extend<bool>("MEMO_SIGNON");
- if (uint & OLD_NI_MEMO_RECEIVE)
+ if (u32 & OLD_NI_MEMO_RECEIVE)
nc->Extend<bool>("MEMO_RECEIVE");
- if (uint & OLD_NI_PRIVATE)
+ if (u32 & OLD_NI_PRIVATE)
nc->Extend<bool>("NS_PRIVATE");
- if (uint & OLD_NI_HIDE_EMAIL)
+ if (u32 & OLD_NI_HIDE_EMAIL)
nc->Extend<bool>("HIDE_EMAIL");
- if (uint & OLD_NI_HIDE_MASK)
+ if (u32 & OLD_NI_HIDE_MASK)
nc->Extend<bool>("HIDE_MASK");
- if (uint & OLD_NI_HIDE_QUIT)
+ if (u32 & OLD_NI_HIDE_QUIT)
nc->Extend<bool>("HIDE_QUIT");
- if (uint & OLD_NI_KILL_QUICK)
+ if (u32 & OLD_NI_KILL_QUICK)
nc->Extend<bool>("KILL_QUICK");
- if (uint & OLD_NI_KILL_IMMED)
+ if (u32 & OLD_NI_KILL_IMMED)
nc->Extend<bool>("KILL_IMMED");
- if (uint & OLD_NI_MEMO_MAIL)
+ if (u32 & OLD_NI_MEMO_MAIL)
nc->Extend<bool>("MEMO_MAIL");
- if (uint & OLD_NI_HIDE_STATUS)
+ if (u32 & OLD_NI_HIDE_STATUS)
nc->Extend<bool>("HIDE_STATUS");
- if (uint & OLD_NI_SUSPENDED)
+ if (u32 & OLD_NI_SUSPENDED)
nc->Extend<bool>("SUSPENDED");
- if (!(uint & OLD_NI_AUTOOP))
+ if (!(u32 & OLD_NI_AUTOOP))
nc->Extend<bool>("AUTOOP");
uint16_t u16;
@@ -549,7 +549,7 @@ static void LoadNicks()
for (int16_t j = 0; j < i16; ++j)
{
Memo *m = new Memo;
- READ(read_uint32(&uint, f));
+ READ(read_uint32(&u32, f));
uint16_t flags;
READ(read_uint16(&flags, f));
int32_t tmp32;
diff --git a/modules/database/db_plain.cpp b/modules/database/db_plain.cpp
index 69fafea99..6a6de9f06 100644
--- a/modules/database/db_plain.cpp
+++ b/modules/database/db_plain.cpp
@@ -216,11 +216,10 @@ EventReturn OnDatabaseReadMetadata(ChannelInfo *ci, const Anope::string &key, co
throw DatabaseException("Akick for nonexistant core " + params[2] + " on " + ci->name);
}
- AutoKick *ak;
if (Nick)
- ak = ci->AddAkick(params[3], nc, params.size() > 6 ? params[6] : "", params[4].is_pos_number_only() ? convertTo<time_t>(params[4]) : 0, params[5].is_pos_number_only() ? convertTo<time_t>(params[5]) : 0);
+ ci->AddAkick(params[3], nc, params.size() > 6 ? params[6] : "", params[4].is_pos_number_only() ? convertTo<time_t>(params[4]) : 0, params[5].is_pos_number_only() ? convertTo<time_t>(params[5]) : 0);
else
- ak = ci->AddAkick(params[3], params[2], params.size() > 6 ? params[6] : "", params[4].is_pos_number_only() ? convertTo<time_t>(params[4]) : 0, params[5].is_pos_number_only() ? convertTo<time_t>(params[5]) : 0);
+ ci->AddAkick(params[3], params[2], params.size() > 6 ? params[6] : "", params[4].is_pos_number_only() ? convertTo<time_t>(params[4]) : 0, params[5].is_pos_number_only() ? convertTo<time_t>(params[5]) : 0);
}
else if (key.equals_ci("LOG"))
generated by cgit (git 2.34.1) at 2025-07-04 03:51:37 +0000