Parcourir la source

Z991239-938 #comment fix: 字符串格式化函数处理

翟俊伟80258120 il y a 5 ans
Parent
commit
d047811669
1 fichiers modifiés avec 31 ajouts et 7 suppressions
  1. 31 7
      Module/mod_CustMngrAuth/CustMngrAuthFSM.cpp

+ 31 - 7
Module/mod_CustMngrAuth/CustMngrAuthFSM.cpp

@@ -416,8 +416,14 @@ bool CCustMngrAuthFSM::ReadDataIntoMemory(bool& bHasData)
 			fd->FingerIDArray.Init(FINGERNUM);
 			fd->FingerIDLenArray.Init(FINGERNUM);
 			for (int i = 0; i < FINGERNUM; ++i){
-				char index[20];
-				_snprintf_s(index, 10, "FingerID%d", i+1);
+				char index[20] = { 0 };
+
+#ifdef RVC_OS_WIN
+				_snprintf_s(index, 10, "FingerID%d", i + 1);
+#else
+				snprintf(index, 10, "FingerID%d", i + 1);
+#endif // RVC_OS_WIN
+				
 				fd->FingerIDArray[i] = root.isMember(index) ? CSimpleStringA(root[index].asCString()) : "";
 				fd->FingerIDLenArray[i] = root.isMember(index) ? fd->FingerIDArray[i].GetLength() : 0;
 			}
@@ -644,8 +650,13 @@ void CCustMngrAuthFSM::FeatureUpdate()
 						for(int fingerIndex = 0; fingerIndex < FINGERNUM; ++fingerIndex){
 							char FingerID[20];//运行时文件是"FingerID"
 							char fingerId[20];//分行服务是"fingerId"    二者不一致,历史遗留
-							_snprintf_s(FingerID, 10, "FingerID%d", fingerIndex+1);
-							_snprintf_s(fingerId, 10, "fingerId%d", fingerIndex+1);
+#ifdef RVC_OS_WIN
+							_snprintf_s(FingerID, 10, "FingerID%d", fingerIndex + 1);
+							_snprintf_s(fingerId, 10, "fingerId%d", fingerIndex + 1);
+#else
+							snprintf(FingerID, 10, "FingerID%d", fingerIndex + 1);
+							snprintf(fingerId, 10, "fingerId%d", fingerIndex + 1);
+#endif // RVC_OS_WIN
 							jsonFingerInfo[FingerID] = root[i][fingerId].asCString();
 							fd->FingerIDArray[fingerIndex] = CSimpleStringA(root[i][fingerId].asCString());
 							fd->FingerIDLenArray[fingerIndex] = fd->FingerIDArray[fingerIndex].GetLength();
@@ -1096,7 +1107,13 @@ ErrorCodeEnum CCustMngrAuthFSM::SaveFingerPrint(SpReqAnsContext<CustMngrAuthServ
 	fd->FingerIDLenArray.Init(fingerIDNum);
 	for (int i = 0; i < fingerIDNum; ++i){
 		char a[20]={0};
-		_snprintf_s(a, 10,"FingerID%d", ctx->Req.FingerIdList[i]);
+
+#ifdef RVC_OS_WIN
+		_snprintf_s(a, 10, "FingerID%d", ctx->Req.FingerIdList[i]);
+#else
+		snprintf(a, 10, "FingerID%d", ctx->Req.FingerIdList[i]);
+#endif // RVC_OS_WIN
+
 		Dbg("writing %s",a);
 		fingerInfo[a] = (const char*)ctx->Req.FPFeatureList[i];
 		fd->FingerIDArray[i] = ctx->Req.FPFeatureList[i];
@@ -1237,8 +1254,14 @@ CSimpleStringA CCustMngrAuthFSM::GetCurrentDate()
 {
 	time_t curTime = time(NULL);
 	tm* p = localtime(&curTime);
-	char cTime[100];
-	sprintf(cTime, "%d%02d%02d", p->tm_year+1900, p->tm_mon+1, p->tm_mday);
+	char cTime[100] = { 0 };
+
+#ifdef RVC_OS_WIN
+	_snprintf_s(cTime, 100, "%d%02d%02d", p->tm_year + 1900, p->tm_mon + 1, p->tm_mday);
+#else
+	snprintf(cTime, 100, "%d%02d%02d", p->tm_year + 1900, p->tm_mon + 1, p->tm_mday);
+#endif // RVC_OS_WIN
+
 	CSimpleStringA curDate(cTime);
 	return curDate;
 }
@@ -1262,6 +1285,7 @@ int CCustMngrAuthFSM::CompareUpdateTime(const char* time1, const char* time2)
 {
 	int year1, month1, day1, hour1, minute1, second1;
 	int year2, month2, day2, hour2, minute2, second2;
+
 	sscanf(time1, "%d-%d-%d %d:%d:%d", &year1, &month1, &day1, &hour1, &minute1, &second1);
 	sscanf(time2, "%d-%d-%d %d:%d:%d", &year2, &month2, &day2, &hour2, &minute2, &second2);