github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-11-18 10:20:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Collections cleanup: removes resolveFirstCopy method

Browse Source
This commit is contained in:
Felipe Zimmerle
2016-12-23 10:36:51 -03:00
parent 6fff8c954a
commit 168fa22e19
8 changed files with 4 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/collection/backend/in_memory-per_process.cc
View File

@@ -166,17 +166,6 @@ std::string* InMemoryPerProcess::resolveFirst(const std::string& var) {
}
std::string InMemoryPerProcess::resolveFirstCopy(const std::string& var) {
auto range = equal_range(var);
for (auto it = range.first; it != range.second; ++it) {
return it->second;
}
return "";
}
} // namespace backend
} // namespace collection
} // namespace modsecurity

1
src/collection/backend/in_memory-per_process.h
View File

@@ -83,7 +83,6 @@ class InMemoryPerProcess :
void del(const std::string& key) override;
std::string* resolveFirst(const std::string& var) override;
std::string resolveFirstCopy(const std::string& var) override;
void resolveSingleMatch(const std::string& var,
std::vector<const Variable *> *l) override;

40
src/collection/backend/lmdb.cc
View File

@@ -161,46 +161,6 @@ void LMDB::lmdb_debug(int rc, std::string op, std::string scope) {
}
std::string LMDB::resolveFirstCopy(const std::string& var) {
int rc;
MDB_val mdb_key;
MDB_val mdb_value;
MDB_val mdb_value_ret;
std::string ret;
MDB_txn *txn = NULL;
MDB_dbi dbi;
string2val(var, &mdb_key);
rc = mdb_txn_begin(m_env, NULL, 0, &txn);
lmdb_debug(rc, "txn", "resolveFirst");
if (rc != 0) {
goto end_txn;
}
rc = mdb_dbi_open(txn, NULL, MDB_CREATE | MDB_DUPSORT, &dbi);
lmdb_debug(rc, "dbi", "resolveFirst");
if (rc != 0) {
goto end_dbi;
}
rc = mdb_get(txn, dbi, &mdb_key, &mdb_value_ret);
lmdb_debug(rc, "get", "resolveFirst");
if (rc != 0) {
goto end_get;
}
ret.assign(
reinterpret_cast<char *>(mdb_value_ret.mv_data),
mdb_value_ret.mv_size);
end_get:
mdb_dbi_close(m_env, dbi);
end_dbi:
mdb_txn_abort(txn);
end_txn:
return ret;
}
std::string* LMDB::resolveFirst(const std::string& var) {
int rc;
MDB_val mdb_key;

1
src/collection/backend/lmdb.h
View File

@@ -62,7 +62,6 @@ class LMDB :
void del(const std::string& key) override;
std::string* resolveFirst(const std::string& var) override;
std::string resolveFirstCopy(const std::string& var) override;
void resolveSingleMatch(const std::string& var,
std::vector<const Variable *> *l) override;