ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-11 19:49:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Change to use GetId() and ID rather than GetData() and data

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4531 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
om 2006-07-23 15:47:08 +00:00
parent cdfeb4f406
commit 69790e320d
9 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/extra/m_mysql.cpp
View File

@ -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;
}

4
src/modules/extra/m_pgsql.cpp
View File

@ -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;
}

6
src/modules/extra/m_sqlauth.cpp
View File

@ -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;
}

5
src/modules/extra/m_sqllog.cpp
View File

@ -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;
}

6
src/modules/extra/m_sqloper.cpp
View File

@ -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;
}

12
src/modules/extra/m_sqlutils.cpp
View File

@ -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;
}

10
src/modules/extra/m_sqlutils.h
View File

@ -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)
{
}

4
src/modules/extra/m_sqlv2.h
View File

@ -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)
{
}

6
src/modules/extra/m_testclient.cpp
View File

@ -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;
}