Skip to content

Commit

Permalink
clang-tidy: use override
Browse files Browse the repository at this point in the history 
Found with modernize-use-override

Signed-off-by: Rosen Penev <[email protected]>
  • Loading branch information
@neheb
neheb committed Jan 9, 2024
1 parent df8248c commit 9a31539
Show file tree
Hide file tree
Showing 21 changed files with 79 additions and 78 deletions.
2 changes: 1 addition & 1 deletion modules/bindbackend/bindbackend2.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ class Bind2Backend : public DNSBackend
{
public:
Bind2Backend(const string& suffix = "", bool loadZones = true);
~Bind2Backend();
~Bind2Backend() override;
void getUnfreshSecondaryInfos(vector<DomainInfo>* unfreshDomains) override;
void getUpdatedPrimaries(vector<DomainInfo>& changedDomains, std::unordered_set<DNSName>& catalogs, CatalogHashMap& catalogHashes) override;
bool getDomainInfo(const DNSName& domain, DomainInfo& di, bool getSerial = true) override;
Expand Down
2 changes: 1 addition & 1 deletion modules/geoipbackend/geoipbackend.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class GeoIPBackend : public DNSBackend
{
public:
GeoIPBackend(const std::string& suffix = "");
~GeoIPBackend();
~GeoIPBackend() override;

void lookup(const QType& qtype, const DNSName& qdomain, int zoneId, DNSPacket* pkt_p = nullptr) override;
bool list(const DNSName& /* target */, int /* domain_id */, bool /* include_disabled */ = false) override { return false; } // not supported
Expand Down
2 changes: 1 addition & 1 deletion modules/geoipbackend/geoipinterface-dat.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ class GeoIPInterfaceDAT : public GeoIPInterface
return false;
}

~GeoIPInterfaceDAT() = default;
~GeoIPInterfaceDAT() override = default;

private:
unsigned int d_db_type;
Expand Down
2 changes: 1 addition & 1 deletion modules/geoipbackend/geoipinterface-mmdb.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ class GeoIPInterfaceMMDB : public GeoIPInterface
return true;
}

~GeoIPInterfaceMMDB() { MMDB_close(&d_s); };
~GeoIPInterfaceMMDB() override { MMDB_close(&d_s); };

private:
MMDB_s d_s;
Expand Down
32 changes: 16 additions & 16 deletions modules/gmysqlbackend/smysql.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class SMySQLStatement : public SSqlStatement
}
}

SSqlStatement* bind(const string& /* name */, bool value)
SSqlStatement* bind(const string& /* name */, bool value) override
{
prepareStatement();
if (d_paridx >= d_parnum) {
Expand All @@ -101,15 +101,15 @@ class SMySQLStatement : public SSqlStatement
d_paridx++;
return this;
}
SSqlStatement* bind(const string& name, int value)
SSqlStatement* bind(const string& name, int value) override
{
return bind(name, (long)value);
}
SSqlStatement* bind(const string& name, uint32_t value)
SSqlStatement* bind(const string& name, uint32_t value) override
{
return bind(name, (unsigned long)value);
}
SSqlStatement* bind(const string& /* name */, long value)
SSqlStatement* bind(const string& /* name */, long value) override
{
prepareStatement();
if (d_paridx >= d_parnum) {
Expand All @@ -122,7 +122,7 @@ class SMySQLStatement : public SSqlStatement
d_paridx++;
return this;
}
SSqlStatement* bind(const string& /* name */, unsigned long value)
SSqlStatement* bind(const string& /* name */, unsigned long value) override
{
prepareStatement();
if (d_paridx >= d_parnum) {
Expand All @@ -136,7 +136,7 @@ class SMySQLStatement : public SSqlStatement
d_paridx++;
return this;
}
SSqlStatement* bind(const string& /* name */, long long value)
SSqlStatement* bind(const string& /* name */, long long value) override
{
prepareStatement();
if (d_paridx >= d_parnum) {
Expand All @@ -149,7 +149,7 @@ class SMySQLStatement : public SSqlStatement
d_paridx++;
return this;
}
SSqlStatement* bind(const string& /* name */, unsigned long long value)
SSqlStatement* bind(const string& /* name */, unsigned long long value) override
{
prepareStatement();
if (d_paridx >= d_parnum) {
Expand All @@ -163,7 +163,7 @@ class SMySQLStatement : public SSqlStatement
d_paridx++;
return this;
}
SSqlStatement* bind(const string& /* name */, const std::string& value)
SSqlStatement* bind(const string& /* name */, const std::string& value) override
{
prepareStatement();
if (d_paridx >= d_parnum) {
Expand All @@ -180,7 +180,7 @@ class SMySQLStatement : public SSqlStatement
d_paridx++;
return this;
}
SSqlStatement* bindNull(const string& /* name */)
SSqlStatement* bindNull(const string& /* name */) override
{
prepareStatement();
if (d_paridx >= d_parnum) {
Expand All @@ -192,7 +192,7 @@ class SMySQLStatement : public SSqlStatement
return this;
}

SSqlStatement* execute()
SSqlStatement* execute() override
{
prepareStatement();

Expand Down Expand Up @@ -267,15 +267,15 @@ class SMySQLStatement : public SSqlStatement
return this;
}

bool hasNextRow()
bool hasNextRow() override
{
if (d_dolog && d_residx == d_resnum) {
g_log << Logger::Warning << "Query " << ((long)(void*)this) << ": " << d_dtime.udiffNoReset() << " us total to last row" << endl;
}
return d_residx < d_resnum;
}

SSqlStatement* nextRow(row_t& row)
SSqlStatement* nextRow(row_t& row) override
{
int err;
row.clear();
Expand Down Expand Up @@ -338,7 +338,7 @@ class SMySQLStatement : public SSqlStatement
return this;
}

SSqlStatement* getResult(result_t& result)
SSqlStatement* getResult(result_t& result) override
{
result.clear();
result.reserve(d_resnum);
Expand All @@ -352,7 +352,7 @@ class SMySQLStatement : public SSqlStatement
return this;
}

SSqlStatement* reset()
SSqlStatement* reset() override
{
if (!d_stmt)
return this;
Expand Down Expand Up @@ -383,9 +383,9 @@ class SMySQLStatement : public SSqlStatement
return this;
}

const std::string& getQuery() { return d_query; }
const std::string& getQuery() override { return d_query; }

~SMySQLStatement()
~SMySQLStatement() override
{
releaseStatement();
}
Expand Down
2 changes: 1 addition & 1 deletion modules/gmysqlbackend/smysql.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public:
bool setIsolation = false, unsigned int timeout = 10,
bool threadCleanup = false, bool clientSSL = false);

~SMySQL();
~SMySQL() override;

SSqlException sPerrorException(const string& reason) override;
void setLog(bool state) override;
Expand Down
32 changes: 16 additions & 16 deletions modules/godbcbackend/sodbc.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,31 +112,31 @@ class SODBCStatement : public SSqlStatement
return this;
}

SSqlStatement* bind(const string& name, bool value)
SSqlStatement* bind(const string& name, bool value) override
{
prepareStatement();
return bind(name, (uint32_t)value);
}

SSqlStatement* bind(const string& name, long value)
SSqlStatement* bind(const string& name, long value) override
{
prepareStatement();
return bind(name, (unsigned long)value);
}

SSqlStatement* bind(const string& name, int value)
SSqlStatement* bind(const string& name, int value) override
{
prepareStatement();
return bind(name, (uint32_t)value);
}

SSqlStatement* bind(const string& name, long long value)
SSqlStatement* bind(const string& name, long long value) override
{
prepareStatement();
return bind(name, (unsigned long long)value);
}

SSqlStatement* bind(const string& name, uint32_t value)
SSqlStatement* bind(const string& name, uint32_t value) override
{
prepareStatement();
ODBCParam p;
Expand All @@ -147,7 +147,7 @@ class SODBCStatement : public SSqlStatement
return bind(name, p);
}

SSqlStatement* bind(const string& name, unsigned long value)
SSqlStatement* bind(const string& name, unsigned long value) override
{
prepareStatement();
ODBCParam p;
Expand All @@ -158,7 +158,7 @@ class SODBCStatement : public SSqlStatement
return bind(name, p);
}

SSqlStatement* bind(const string& name, unsigned long long value)
SSqlStatement* bind(const string& name, unsigned long long value) override
{
prepareStatement();
ODBCParam p;
Expand All @@ -169,7 +169,7 @@ class SODBCStatement : public SSqlStatement
return bind(name, p);
}

SSqlStatement* bind(const string& name, const std::string& value)
SSqlStatement* bind(const string& name, const std::string& value) override
{

// cerr<<"asked to bind string "<<value<<endl;
Expand All @@ -190,7 +190,7 @@ class SODBCStatement : public SSqlStatement
return bind(name, p);
}

SSqlStatement* bindNull(const string& name)
SSqlStatement* bindNull(const string& name) override
{
if (d_req_bind.size() > (d_parnum + 1))
throw SSqlException("Trying to bind too many parameters.");
Expand All @@ -207,7 +207,7 @@ class SODBCStatement : public SSqlStatement
return bind(name, p);
}

SSqlStatement* execute()
SSqlStatement* execute() override
{
prepareStatement();
SQLRETURN result;
Expand Down Expand Up @@ -238,14 +238,14 @@ class SODBCStatement : public SSqlStatement
return this;
}

bool hasNextRow()
bool hasNextRow() override
{
// cerr<<"hasNextRow d_result="<<d_result<<endl;
return d_result != SQL_NO_DATA;
}
SSqlStatement* nextRow(row_t& row);
SSqlStatement* nextRow(row_t& row) override;

SSqlStatement* getResult(result_t& result)
SSqlStatement* getResult(result_t& result) override
{
result.clear();
// if (d_res == NULL) return this;
Expand All @@ -257,7 +257,7 @@ class SODBCStatement : public SSqlStatement
return this;
}

SSqlStatement* reset()
SSqlStatement* reset() override
{
SQLCloseCursor(d_statement); // hack, this probably violates some state transitions

Expand All @@ -275,9 +275,9 @@ class SODBCStatement : public SSqlStatement
d_paridx = 0;
return this;
}
const std::string& getQuery() { return d_query; }
const std::string& getQuery() override { return d_query; }

~SODBCStatement()
~SODBCStatement() override
{
releaseStatement();
}
Expand Down
2 changes: 1 addition & 1 deletion modules/godbcbackend/sodbc.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public:
const std::string& password);

//! Destructor.
virtual ~SODBC();
~SODBC() override;

//! Sets the logging state.
void setLog(bool state) override;
Expand Down
32 changes: 16 additions & 16 deletions modules/gpgsqlbackend/spgsql.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ class SPgSQLStatement : public SSqlStatement
d_nstatement = nstatement;
}

SSqlStatement* bind(const string& name, bool value) { return bind(name, string(value ? "t" : "f")); }
SSqlStatement* bind(const string& name, int value) { return bind(name, std::to_string(value)); }
SSqlStatement* bind(const string& name, uint32_t value) { return bind(name, std::to_string(value)); }
SSqlStatement* bind(const string& name, long value) { return bind(name, std::to_string(value)); }
SSqlStatement* bind(const string& name, unsigned long value) { return bind(name, std::to_string(value)); }
SSqlStatement* bind(const string& name, long long value) { return bind(name, std::to_string(value)); }
SSqlStatement* bind(const string& name, unsigned long long value) { return bind(name, std::to_string(value)); }
SSqlStatement* bind(const string& /* name */, const std::string& value)
SSqlStatement* bind(const string& name, bool value) override { return bind(name, string(value ? "t" : "f")); }
SSqlStatement* bind(const string& name, int value) override { return bind(name, std::to_string(value)); }
SSqlStatement* bind(const string& name, uint32_t value) override { return bind(name, std::to_string(value)); }
SSqlStatement* bind(const string& name, long value) override { return bind(name, std::to_string(value)); }
SSqlStatement* bind(const string& name, unsigned long value) override { return bind(name, std::to_string(value)); }
SSqlStatement* bind(const string& name, long long value) override { return bind(name, std::to_string(value)); }
SSqlStatement* bind(const string& name, unsigned long long value) override { return bind(name, std::to_string(value)); }
SSqlStatement* bind(const string& /* name */, const std::string& value) override
{
prepareStatement();
allocate();
Expand All @@ -66,13 +66,13 @@ class SPgSQLStatement : public SSqlStatement
d_paridx++;
return this;
}
SSqlStatement* bindNull(const string& /* name */)
SSqlStatement* bindNull(const string& /* name */) override
{
prepareStatement();
d_paridx++;
return this;
} // these are set null in allocate()
SSqlStatement* execute()
SSqlStatement* execute() override
{
prepareStatement();
if (d_dolog) {
Expand Down Expand Up @@ -140,7 +140,7 @@ class SPgSQLStatement : public SSqlStatement
}
}

bool hasNextRow()
bool hasNextRow() override
{
if (d_dolog && d_residx == d_resnum) {
g_log << Logger::Warning << "Query " << ((long)(void*)this) << ": " << d_dtime.udiff() << " us total to last row" << endl;
Expand All @@ -149,7 +149,7 @@ class SPgSQLStatement : public SSqlStatement
return d_residx < d_resnum;
}

SSqlStatement* nextRow(row_t& row)
SSqlStatement* nextRow(row_t& row) override
{
int i;
row.clear();
Expand Down Expand Up @@ -177,7 +177,7 @@ class SPgSQLStatement : public SSqlStatement
return this;
}

SSqlStatement* getResult(result_t& result)
SSqlStatement* getResult(result_t& result) override
{
result.clear();
if (d_res == nullptr)
Expand All @@ -191,7 +191,7 @@ class SPgSQLStatement : public SSqlStatement
return this;
}

SSqlStatement* reset()
SSqlStatement* reset() override
{
int i;
if (d_res) {
Expand All @@ -217,9 +217,9 @@ class SPgSQLStatement : public SSqlStatement
return this;
}

const std::string& getQuery() { return d_query; }
const std::string& getQuery() override { return d_query; }

~SPgSQLStatement()
~SPgSQLStatement() override
{
releaseStatement();
}
Expand Down
Loading

0 comments on commit 9a31539

Please sign in to comment.