1.1 --- a/core/Database.cpp	Thu Oct 14 18:27:37 2010 -0500
     1.2 +++ b/core/Database.cpp	Sat Oct 16 03:52:36 2010 -0700
     1.3 @@ -47,7 +47,7 @@
     1.4  static bool s_OneTimeThreaderErrorMsg = false;
     1.5  
     1.6  DBManager::DBManager() 
     1.7 -: m_StrTab(512), m_ParseLevel(0), m_ParseState(0), m_pDefault(NULL)
     1.8 +: m_ParseLevel(0), m_ParseState(0), m_pDefault(NULL)
     1.9  {
    1.10  }
    1.11  
    1.12 @@ -136,7 +136,6 @@
    1.13  	m_confs.clear();
    1.14  	m_ParseLevel = 0;
    1.15  	m_ParseState = DBPARSE_LEVEL_NONE;
    1.16 -	m_StrTab.Reset();
    1.17  	m_DefDriver.clear();
    1.18  }
    1.19  
    1.20 @@ -159,7 +158,7 @@
    1.21  		}
    1.22  	} else if (m_ParseState == DBPARSE_LEVEL_MAIN) {
    1.23  		s_CurInfo = ConfDbInfo();
    1.24 -		s_CurInfo.name = m_StrTab.AddString(name);
    1.25 +		s_CurInfo.name = name;
    1.26  		m_ParseState = DBPARSE_LEVEL_DATABASE;
    1.27  	} else if (m_ParseState == DBPARSE_LEVEL_DATABASE) {
    1.28  		m_ParseLevel++;
    1.29 @@ -186,16 +185,16 @@
    1.30  		{
    1.31  			if (strcmp(value, "default") != 0)
    1.32  			{
    1.33 -				s_CurInfo.driver = m_StrTab.AddString(value);
    1.34 +				s_CurInfo.driver = value;
    1.35  			}
    1.36  		} else if (strcmp(key, "database") == 0) {
    1.37 -			s_CurInfo.database = m_StrTab.AddString(value);
    1.38 +			s_CurInfo.database = value;
    1.39  		} else if (strcmp(key, "host") == 0) {
    1.40 -			s_CurInfo.host = m_StrTab.AddString(value);
    1.41 +			s_CurInfo.host = value;
    1.42  		} else if (strcmp(key, "user") == 0) {
    1.43 -			s_CurInfo.user = m_StrTab.AddString(value);
    1.44 +			s_CurInfo.user = value;
    1.45  		} else if (strcmp(key, "pass") == 0) {
    1.46 -			s_CurInfo.pass = m_StrTab.AddString(value);
    1.47 +			s_CurInfo.pass = value;
    1.48  		} else if (strcmp(key, "timeout") == 0) {
    1.49  			s_CurInfo.info.maxTimeout = atoi(value);
    1.50  		} else if (strcmp(key, "port") == 0) {
    1.51 @@ -207,10 +206,10 @@
    1.52  }
    1.53  
    1.54  #define ASSIGN_VAR(var) \
    1.55 -	if (s_CurInfo.var == -1) { \
    1.56 +	if (s_CurInfo.var == "") { \
    1.57  		s_CurInfo.info.var = ""; \
    1.58  	} else { \
    1.59 -		s_CurInfo.info.var = m_StrTab.GetString(s_CurInfo.var); \
    1.60 +		s_CurInfo.info.var = s_CurInfo.var.c_str(); \
    1.61  	}
    1.62  
    1.63  SMCResult DBManager::ReadSMC_LeavingSection(const SMCStates *states)
    1.64 @@ -453,7 +452,7 @@
    1.65  	for (iter=m_confs.begin(); iter!=m_confs.end(); iter++)
    1.66  	{
    1.67  		ConfDbInfo &conf = (*iter);
    1.68 -		if (strcmp(m_StrTab.GetString(conf.name), name) == 0)
    1.69 +		if (conf.name == name)
    1.70  		{
    1.71  			return &conf;
    1.72  		}