#IQRV #comment [BugFix] 不必要代码注释的移除

Module/mod_HolderContext/HolderContextFSM.cpp

@@ -233,12 +233,6 @@ void HolderContextFSM::OnSysVarEvent( const char *pszKey, const char *pszValue,c
 ErrorCodeEnum HolderContextFSM::OnInit()
 {
 	ErrorCodeEnum Error;
-	/*Error = LoadServerConfig();
-	if (Error != Error_Succeed) 
-	{
-		LOG_TRACE("load HolderContext config failed!");
-		return Error; 
-	}*/
 
 	Error = LoadRootConfig();
 	if (Error != Error_Succeed) 
@@ -845,21 +839,6 @@ unsigned int HolderContextFSM::s12_on_event(FSMEvent* event)
 	return 0;
 }
 
-ErrorCodeEnum HolderContextFSM::LoadServerConfig()
-{
-	CSmartPointer<IEntityFunction> spFunction = m_pEntity->GetFunction();
-	CSmartPointer<IConfigInfo> spConfig;
-	ErrorCodeEnum Error = spFunction->OpenConfig(Config_Software, spConfig);
-	if (Error == Error_Succeed) 
-	{
-		Error = spConfig->ReadConfigValue("VerifyKey", "Key", m_StringVerifyKey);
-		if(Error == Error_Succeed)
-			Error = spConfig->ReadConfigValue("GuiConsole", "Name", m_StringConsoleName);
-	}
-
-	return Error;
-}
-
 ErrorCodeEnum HolderContextFSM::LoadCenterConfig()
 {
 	CSmartPointer<IEntityFunction> spFunction = m_pEntity->GetFunction();

Module/mod_HolderContext/HolderContextFSM.h

@@ -419,7 +419,6 @@ public:
 private:
 	//读配置文件
 
-	ErrorCodeEnum LoadServerConfig();
 	ErrorCodeEnum LoadRootConfig();
 	ErrorCodeEnum LoadCenterConfig();
 	CSimpleStringA m_StringVerifyKey,m_StringConsoleName;

Module/mod_MaintainWatcher/ukeytask.cpp

@@ -180,45 +180,6 @@ ErrorCodeEnum UKEYTask::GetEntity(const char *entity_name, EntityEntry &e)
 	return Error;
 }
 
-//ErrorCodeEnum UKEYTask::GetCustomizeStartMenuList(CAutoArray<StartMenuEntry> &StartItems)
-//{
-//	CSmartPointer<IEntityFunction> spFunc = m_pEntity->GetFunction();
-//	CSmartPointer<IConfigInfo> spConfig;
-//	LOG_ASSERT(spFunc != NULL);
-//	int cnt = 0;
-//	ErrorCodeEnum Error = spFunc->OpenConfig(Config_Software, spConfig);
-//	if (Error != Error_Succeed)
-//		return Error;
-//	Error = spConfig->ReadConfigValueInt("StartMenu", "Number", cnt);
-//	if (Error != Error_Succeed)
-//		return Error;
-//	StartItems.Init(cnt);
-//	for (int i = 0; i < cnt; ++i) {
-//		char tmp[128];
-//		CSimpleStringA strValue;
-//		_itoa(i+1, tmp, 10);
-//		Error = spConfig->ReadConfigValue("StartMenu", tmp, strValue);
-//		const char *p = strValue;
-//		if (Error != Error_Succeed || p == NULL || strValue.GetLength() == 0)
-//			break;
-//		int kk = 0;
-//		while (*p && *p != ' ') {
-//			tmp[kk++] = *p;
-//			p++;
-//		}
-//		tmp[kk] = 0;
-//		StartItems[i].strEntity = tmp;
-//		while (*p && *p == ' ')
-//			p++;
-//		if (*p) {
-//			StartItems[i].strCmdLine = p;
-//		} else {
-//			StartItems[i].strCmdLine = "";
-//		}
-//	}
-//	return Error;
-//}
-
 void UKEYTask::OnAnswer(CSmartPointer<IAsynWaitSp> pAsynWaitSp)
 {
 	if (m_hWndMainFrame) {

Module/mod_cardissuer/CardIssuerFSM.cpp

@@ -2243,7 +2243,7 @@ void CCardIssuerFSM::LoadCMBBin()
 	CSmartPointer<IConfigInfo> spConfig;
 	ErrorCodeEnum eErrDev = spEntityFunction->OpenConfig(Config_Software, spConfig);
 	if (eErrDev != Error_Succeed) {
-		Dbg("LoadCMBBin, open module cfg file failed!");
+		Dbg("LoadCMBBin, open module cfg file failed! %s", SpStrError(eErrDev));
 		return;
 	}
 	int dmCount,diCount,cmCount,ciCount;

Module/mod_cardswiper/CardSwiperFSM.cpp

@@ -2174,7 +2174,7 @@ void CCardSwiperFSM::LoadCMBBin()
 	CSmartPointer<IConfigInfo> spConfig;
 	ErrorCodeEnum eErrDev = spEntityFunction->OpenConfig(Config_Software, spConfig);
 	if (eErrDev != Error_Succeed) {
-		Dbg("open module cfg file failed!");
+		Dbg("open module cfg file failed! %s", SpStrError(eErrDev));
 		return;
 	}
 	int dmCount,diCount,cmCount,ciCount;

Module/mod_selfchecker/mod_selfchecker.h

@@ -83,7 +83,7 @@ public:
 		CSmartPointer<IConfigInfo> spConfig;
 		ErrorCodeEnum eCfg = pFunc->OpenConfig(Config_Software, spConfig);
 		if (eCfg != Error_Succeed) {
-			Dbg("open cfg file failed()!",eCfg);
+			Dbg("open cfg file failed(%s)!",SpStrError(eCfg));
 		}
 		else
 		{

Module/mod_upload/test/TestMod_upload.cpp

@@ -3,23 +3,6 @@
 #include "XZipZilb.h"
 #include "fileutil.h"
 
-
-//TEST_CASE_ENTITY_CLASS(CUploadEntity, "upload_create")
-//{
-//	LOG_FUNCTION();
-//
-//	struct list_head m_updir_list;//文件夹配置列表
-//	INIT_LIST_HEAD(&m_updir_list);
-//	CSimpleStringA checkStr = "";
-//	CSmartPointer<IConfigInfo> spConfig;
-//	this->GetFunction()->OpenConfig(Config_Software, spConfig);
-//	ErrorCodeEnum Error  = (ErrorCodeEnum)upload_create(&m_updir_list, this->GetFunction().GetRawPointer(), spConfig.GetRawPointer(), checkStr);
-//	if (Error == Error_Succeed) {
-//		Dbg("upload_create is success");
-//	}
-//	return Error;
-//}
-
 TEST_CASE_ENTITY_CLASS(CUploadEntity, "upload_fresh")
 {
 	LOG_FUNCTION();