summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/modules/extra/m_mysql.cpp5
-rw-r--r--src/modules/extra/m_pgsql.cpp4
-rw-r--r--src/modules/extra/m_sqlauth.cpp6
-rw-r--r--src/modules/extra/m_sqllog.cpp5
-rw-r--r--src/modules/extra/m_sqloper.cpp6
-rw-r--r--src/modules/extra/m_sqlutils.cpp12
-rw-r--r--src/modules/extra/m_sqlutils.h10
-rw-r--r--src/modules/extra/m_sqlv2.h4
-rw-r--r--src/modules/extra/m_testclient.cpp6
9 files changed, 28 insertions, 30 deletions
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 512780318..c08adfd1d 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -750,7 +750,7 @@ class ModuleSQL : public Module
char* OnRequest(Request* request)
{
- if(strcmp(SQLREQID, request->GetData()) == 0)
+ if(strcmp(SQLREQID, request->GetId()) == 0)
{
SQLrequest* req = (SQLrequest*)request;
@@ -780,7 +780,7 @@ class ModuleSQL : public Module
return returnval;
}
- log(DEBUG, "Got unsupported API version string: %s", request->GetData());
+ log(DEBUG, "Got unsupported API version string: %s", request->GetId());
return NULL;
}
@@ -923,4 +923,3 @@ extern "C" void * init_module( void )
{
return new ModuleSQLFactory;
}
-
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index ec44f2970..307be5d60 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -517,7 +517,7 @@ public:
virtual char* OnRequest(Request* request)
{
- if(strcmp(SQLREQID, request->GetData()) == 0)
+ if(strcmp(SQLREQID, request->GetId()) == 0)
{
SQLrequest* req = (SQLrequest*)request;
ConnMap::iterator iter;
@@ -539,7 +539,7 @@ public:
}
}
- log(DEBUG, "Got unsupported API version string: %s", request->GetData());
+ log(DEBUG, "Got unsupported API version string: %s", request->GetId());
return NULL;
}
diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index d468af959..a1b58151d 100644
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -142,13 +142,13 @@ public:
virtual char* OnRequest(Request* request)
{
- if(strcmp(SQLRESID, request->GetData()) == 0)
+ if(strcmp(SQLRESID, request->GetId()) == 0)
{
SQLresult* res;
res = static_cast<SQLresult*>(request);
- log(DEBUG, "Got SQL result (%s) with ID %lu", res->GetData(), res->id);
+ log(DEBUG, "Got SQL result (%s) with ID %lu", res->GetId(), res->id);
userrec* user = GetAssocUser(this, SQLutils, res->id).S().user;
UnAssociate(this, SQLutils, res->id).S();
@@ -187,7 +187,7 @@ public:
return SQLSUCCESS;
}
- log(DEBUG, "Got unsupported API version string: %s", request->GetData());
+ log(DEBUG, "Got unsupported API version string: %s", request->GetId());
return NULL;
}
diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp
index 4ce24822d..46e3bb308 100644
--- a/src/modules/extra/m_sqllog.cpp
+++ b/src/modules/extra/m_sqllog.cpp
@@ -305,13 +305,13 @@ class ModuleSQLLog : public Module
virtual char* OnRequest(Request* request)
{
log(DEBUG,"OnRequest in m_sqllog.so");
- if(strcmp(SQLRESID, request->GetData()) == 0)
+ if(strcmp(SQLRESID, request->GetId()) == 0)
{
SQLresult* res;
std::map<unsigned long, QueryInfo*>::iterator n;
res = static_cast<SQLresult*>(request);
- log(DEBUG, "Got SQL result (%s) with ID %lu", res->GetData(), res->id);
+ log(DEBUG, "Got SQL result (%s) with ID %lu", res->GetId(), res->id);
n = active_queries.find(res->id);
@@ -431,4 +431,3 @@ extern "C" void * init_module( void )
{
return new ModuleSQLLogFactory;
}
-
diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp
index bab467a35..191753e66 100644
--- a/src/modules/extra/m_sqloper.cpp
+++ b/src/modules/extra/m_sqloper.cpp
@@ -128,13 +128,13 @@ public:
virtual char* OnRequest(Request* request)
{
- if(strcmp(SQLRESID, request->GetData()) == 0)
+ if(strcmp(SQLRESID, request->GetId()) == 0)
{
SQLresult* res;
res = static_cast<SQLresult*>(request);
- log(DEBUG, "Got SQL result (%s) with ID %lu", res->GetData(), res->id);
+ log(DEBUG, "Got SQL result (%s) with ID %lu", res->GetId(), res->id);
userrec* user = GetAssocUser(this, SQLutils, res->id).S().user;
UnAssociate(this, SQLutils, res->id).S();
@@ -205,7 +205,7 @@ public:
return SQLSUCCESS;
}
- log(DEBUG, "Got unsupported API version string: %s", request->GetData());
+ log(DEBUG, "Got unsupported API version string: %s", request->GetId());
return NULL;
}
diff --git a/src/modules/extra/m_sqlutils.cpp b/src/modules/extra/m_sqlutils.cpp
index 3bde05fd9..bbda7f3ea 100644
--- a/src/modules/extra/m_sqlutils.cpp
+++ b/src/modules/extra/m_sqlutils.cpp
@@ -57,7 +57,7 @@ public:
virtual char* OnRequest(Request* request)
{
- if(strcmp(SQLUTILAU, request->GetData()) == 0)
+ if(strcmp(SQLUTILAU, request->GetId()) == 0)
{
AssociateUser* req = (AssociateUser*)request;
@@ -67,7 +67,7 @@ public:
AttachList(req->user, req->id);
}
- else if(strcmp(SQLUTILAC, request->GetData()) == 0)
+ else if(strcmp(SQLUTILAC, request->GetId()) == 0)
{
AssociateChan* req = (AssociateChan*)request;
@@ -77,7 +77,7 @@ public:
AttachList(req->chan, req->id);
}
- else if(strcmp(SQLUTILUA, request->GetData()) == 0)
+ else if(strcmp(SQLUTILUA, request->GetId()) == 0)
{
UnAssociate* req = (UnAssociate*)request;
@@ -90,7 +90,7 @@ public:
DoUnAssociate(iduser, req->id);
DoUnAssociate(idchan, req->id);
}
- else if(strcmp(SQLUTILGU, request->GetData()) == 0)
+ else if(strcmp(SQLUTILGU, request->GetId()) == 0)
{
GetAssocUser* req = (GetAssocUser*)request;
@@ -104,7 +104,7 @@ public:
req->user = iter->second;
}
}
- else if(strcmp(SQLUTILGC, request->GetData()) == 0)
+ else if(strcmp(SQLUTILGC, request->GetId()) == 0)
{
GetAssocChan* req = (GetAssocChan*)request;
@@ -120,7 +120,7 @@ public:
}
else
{
- log(DEBUG, "Got unsupported API version string: %s", request->GetData());
+ log(DEBUG, "Got unsupported API version string: %s", request->GetId());
return NULL;
}
diff --git a/src/modules/extra/m_sqlutils.h b/src/modules/extra/m_sqlutils.h
index 26a5f1265..23cb41a1e 100644
--- a/src/modules/extra/m_sqlutils.h
+++ b/src/modules/extra/m_sqlutils.h
@@ -17,7 +17,7 @@ public:
userrec* user;
AssociateUser(Module* s, Module* d, unsigned long i, userrec* u)
- : Request(SQLUTILAU, s, d), id(i), user(u)
+ : Request(s, d, SQLUTILAU), id(i), user(u)
{
}
@@ -35,7 +35,7 @@ public:
chanrec* chan;
AssociateChan(Module* s, Module* d, unsigned long i, chanrec* u)
- : Request(SQLUTILAC, s, d), id(i), chan(u)
+ : Request(s, d, SQLUTILAC), id(i), chan(u)
{
}
@@ -52,7 +52,7 @@ public:
unsigned long id;
UnAssociate(Module* s, Module* d, unsigned long i)
- : Request(SQLUTILUA, s, d), id(i)
+ : Request(s, d, SQLUTILUA), id(i)
{
}
@@ -70,7 +70,7 @@ public:
userrec* user;
GetAssocUser(Module* s, Module* d, unsigned long i)
- : Request(SQLUTILGU, s, d), id(i), user(NULL)
+ : Request(s, d, SQLUTILGU), id(i), user(NULL)
{
}
@@ -88,7 +88,7 @@ public:
chanrec* chan;
GetAssocChan(Module* s, Module* d, unsigned long i)
- : Request(SQLUTILGC, s, d), id(i), chan(NULL)
+ : Request(s, d, SQLUTILGC), id(i), chan(NULL)
{
}
diff --git a/src/modules/extra/m_sqlv2.h b/src/modules/extra/m_sqlv2.h
index 9c7d1750a..fbacb99f7 100644
--- a/src/modules/extra/m_sqlv2.h
+++ b/src/modules/extra/m_sqlv2.h
@@ -221,7 +221,7 @@ public:
* @param q A properly initialized SQLquery object.
*/
SQLrequest(Module* s, Module* d, const std::string &databaseid, const SQLquery &q)
- : Request(SQLREQID, s, d), query(q), dbid(databaseid), pri(false), id(0)
+ : Request(s, d, SQLREQID), query(q), dbid(databaseid), pri(false), id(0)
{
}
@@ -307,7 +307,7 @@ public:
/** Used by the SQL API to instantiate an SQLrequest
*/
SQLresult(Module* s, Module* d, unsigned long i)
- : Request(SQLRESID, s, d), id(i)
+ : Request(s, d, SQLRESID), id(i)
{
}
diff --git a/src/modules/extra/m_testclient.cpp b/src/modules/extra/m_testclient.cpp
index 0df1f8c59..6aec581ae 100644
--- a/src/modules/extra/m_testclient.cpp
+++ b/src/modules/extra/m_testclient.cpp
@@ -50,9 +50,9 @@ public:
virtual char* OnRequest(Request* request)
{
- if(strcmp(SQLRESID, request->GetData()) == 0)
+ if(strcmp(SQLRESID, request->GetId()) == 0)
{
- log(DEBUG, "Got SQL result (%s)", request->GetData());
+ log(DEBUG, "Got SQL result (%s)", request->GetId());
SQLresult* res = (SQLresult*)request;
@@ -86,7 +86,7 @@ public:
return SQLSUCCESS;
}
- log(DEBUG, "Got unsupported API version string: %s", request->GetData());
+ log(DEBUG, "Got unsupported API version string: %s", request->GetId());
return NULL;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 22:43:24 +0000