UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use SH strings for database configs (bug 4286, r=dvander)

Browse Source
This commit is contained in:
Fyren 2010-10-16 03:52:36 -07:00
parent e6a93a799a
commit b4a0d7a5b7
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/Database.cpp
View File

@ -47,7 +47,7 @@ DBManager g_DBMan;
static bool s_OneTimeThreaderErrorMsg = false; static bool s_OneTimeThreaderErrorMsg = false;
DBManager::DBManager() DBManager::DBManager()
: m_StrTab(512), m_ParseLevel(0), m_ParseState(0), m_pDefault(NULL) : m_ParseLevel(0), m_ParseState(0), m_pDefault(NULL)
{ {
} }
@ -136,7 +136,6 @@ void DBManager::ReadSMC_ParseStart()
m_confs.clear(); m_confs.clear();
m_ParseLevel = 0; m_ParseLevel = 0;
m_ParseState = DBPARSE_LEVEL_NONE; m_ParseState = DBPARSE_LEVEL_NONE;
m_StrTab.Reset();
m_DefDriver.clear(); m_DefDriver.clear();
} }
@ -159,7 +158,7 @@ SMCResult DBManager::ReadSMC_NewSection(const SMCStates *states, const char *nam
} }
} else if (m_ParseState == DBPARSE_LEVEL_MAIN) { } else if (m_ParseState == DBPARSE_LEVEL_MAIN) {
s_CurInfo = ConfDbInfo(); s_CurInfo = ConfDbInfo();
s_CurInfo.name = m_StrTab.AddString(name); s_CurInfo.name = name;
m_ParseState = DBPARSE_LEVEL_DATABASE; m_ParseState = DBPARSE_LEVEL_DATABASE;
} else if (m_ParseState == DBPARSE_LEVEL_DATABASE) { } else if (m_ParseState == DBPARSE_LEVEL_DATABASE) {
m_ParseLevel++; m_ParseLevel++;
@ -186,16 +185,16 @@ SMCResult DBManager::ReadSMC_KeyValue(const SMCStates *states, const char *key,
{ {
if (strcmp(value, "default") != 0) if (strcmp(value, "default") != 0)
{ {
s_CurInfo.driver = m_StrTab.AddString(value); s_CurInfo.driver = value;
} }
} else if (strcmp(key, "database") == 0) { } else if (strcmp(key, "database") == 0) {
s_CurInfo.database = m_StrTab.AddString(value); s_CurInfo.database = value;
} else if (strcmp(key, "host") == 0) { } else if (strcmp(key, "host") == 0) {
s_CurInfo.host = m_StrTab.AddString(value); s_CurInfo.host = value;
} else if (strcmp(key, "user") == 0) { } else if (strcmp(key, "user") == 0) {
s_CurInfo.user = m_StrTab.AddString(value); s_CurInfo.user = value;
} else if (strcmp(key, "pass") == 0) { } else if (strcmp(key, "pass") == 0) {
s_CurInfo.pass = m_StrTab.AddString(value); s_CurInfo.pass = value;
} else if (strcmp(key, "timeout") == 0) { } else if (strcmp(key, "timeout") == 0) {
s_CurInfo.info.maxTimeout = atoi(value); s_CurInfo.info.maxTimeout = atoi(value);
} else if (strcmp(key, "port") == 0) { } else if (strcmp(key, "port") == 0) {
@ -207,10 +206,10 @@ SMCResult DBManager::ReadSMC_KeyValue(const SMCStates *states, const char *key,
} }
#define ASSIGN_VAR(var) \ #define ASSIGN_VAR(var) \
if (s_CurInfo.var == -1) { \ if (s_CurInfo.var == "") { \
s_CurInfo.info.var = ""; \ s_CurInfo.info.var = ""; \
} else { \ } else { \
s_CurInfo.info.var = m_StrTab.GetString(s_CurInfo.var); \ s_CurInfo.info.var = s_CurInfo.var.c_str(); \
} }
SMCResult DBManager::ReadSMC_LeavingSection(const SMCStates *states) SMCResult DBManager::ReadSMC_LeavingSection(const SMCStates *states)
@ -453,7 +452,7 @@ ConfDbInfo *DBManager::GetDatabaseConf(const char *name)
for (iter=m_confs.begin(); iter!=m_confs.end(); iter++) for (iter=m_confs.begin(); iter!=m_confs.end(); iter++)
{ {
ConfDbInfo &conf = (*iter); ConfDbInfo &conf = (*iter);
if (strcmp(m_StrTab.GetString(conf.name), name) == 0) if (conf.name == name)
{ {
return &conf; return &conf;
} }

16
core/Database.h
View File

@ -47,16 +47,15 @@ using namespace SourceHook;
struct ConfDbInfo struct ConfDbInfo
{ {
ConfDbInfo() : name(-1), driver(-1), host(-1), user(-1), pass(-1), ConfDbInfo() : realDriver(NULL)
database(-1), realDriver(NULL)
{ {
} }
int name; String name;
int driver; String driver;
int host; String host;
int user; String user;
int pass; String pass;
int database; String database;
IDBDriver *realDriver; IDBDriver *realDriver;
DatabaseInfo info; DatabaseInfo info;
}; };
@ -138,7 +137,6 @@ private:
HandleType_t m_DriverType; HandleType_t m_DriverType;
HandleType_t m_DatabaseType; HandleType_t m_DatabaseType;
String m_DefDriver; String m_DefDriver;
BaseStringTable m_StrTab;
char m_Filename[PLATFORM_MAX_PATH]; char m_Filename[PLATFORM_MAX_PATH];
unsigned int m_ParseLevel; unsigned int m_ParseLevel;
unsigned int m_ParseState; unsigned int m_ParseState;