svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp
index a044710195..a941941fa8 100644
--- a/indra/llcommon/llprocessor.cpp
+++ b/indra/llcommon/llprocessor.cpp
@@ -598,7 +598,7 @@ bool CProcessor::AnalyzeIntelProcessor()
 	else
 	{
 		// If there's no serial number support we just put "No serial number"
-		snprintf( /* Flawfinder: ignore */
+		snprintf(	/* Flawfinder: ignore */
 			CPUInfo.strProcessorSerial,
 			sizeof(CPUInfo.strProcessorSerial),
 			"No Processor Serial Number");	
@@ -974,7 +974,7 @@ bool CProcessor::AnalyzeAMDProcessor()
 		if ((ecxreg >> 24) > 0)
 		{
 			CPUInfo._L1.Data.bPresent = true;
-			snprintf(CPUInfo._L1.Data.strSize, sizeof(CPUInfo._L1.Data.strSize), "%d KB", ecxreg >> 24);	/*Flawfinder: ignore*/
+			snprintf(CPUInfo._L1.Data.strSize, sizeof(CPUInfo._L1.Data.strSize), "%d KB", ecxreg >> 24);		/* Flawfinder: ignore */
 			CPUInfo._L1.Data.uiAssociativeWays = (ecxreg >> 15) & 0xFF;
 			CPUInfo._L1.Data.uiLineSize = ecxreg & 0xFF;
 		}
@@ -982,7 +982,7 @@ bool CProcessor::AnalyzeAMDProcessor()
 		if ((edxreg >> 24) > 0)
 		{
 			CPUInfo._L1.Instruction.bPresent = true;
-			snprintf(CPUInfo._L1.Instruction.strSize, sizeof(CPUInfo._L1.Instruction.strSize), "%d KB", edxreg >> 24); /*Flawfinder: ignore*/
+			snprintf(CPUInfo._L1.Instruction.strSize, sizeof(CPUInfo._L1.Instruction.strSize), "%d KB", edxreg >> 24); 	/* Flawfinder: ignore */
 			CPUInfo._L1.Instruction.uiAssociativeWays = (edxreg >> 15) & 0xFF;
 			CPUInfo._L1.Instruction.uiLineSize = edxreg & 0xFF;
 		}
@@ -1006,7 +1006,7 @@ bool CProcessor::AnalyzeAMDProcessor()
 		if (((ecxreg >> 12) & 0xF) > 0)
 		{
 			CPUInfo._L2.bPresent = true;
-			snprintf(CPUInfo._L2.strSize, sizeof(CPUInfo._L2.strSize), "%d KB", ecxreg >> 16);	/*Flawfinder: ignore*/
+			snprintf(CPUInfo._L2.strSize, sizeof(CPUInfo._L2.strSize), "%d KB", ecxreg >> 16);		/* Flawfinder: ignore */
 			switch ((ecxreg >> 12) & 0xF)
 			{
 				case 1:
@@ -1099,9 +1099,9 @@ bool CProcessor::AnalyzeUnknownProcessor()
 	strcpy(CPUInfo.strProcessorSerial, "Unknown / Not supported");	/*Flawfinder: ignore*/
 
 	// For the family, model and brand id we can only print the numeric value
-	snprintf(CPUInfo.strBrandID, sizeof(CPUInfo.strBrandID), "Brand-ID number %d", CPUInfo.uiBrandID);	/*Flawfinder: ignore*/
-	snprintf(CPUInfo.strFamily, sizeof(CPUInfo.strFamily), "Family number %d", CPUInfo.uiFamily);	/*Flawfinder: ignore*/
-	snprintf(CPUInfo.strModel, sizeof(CPUInfo.strModel), "Model number %d", CPUInfo.uiModel);	/*Flawfinder: ignore*/
+	snprintf(CPUInfo.strBrandID, sizeof(CPUInfo.strBrandID), "Brand-ID number %d", CPUInfo.uiBrandID);		/* Flawfinder: ignore */
+	snprintf(CPUInfo.strFamily, sizeof(CPUInfo.strFamily), "Family number %d", CPUInfo.uiFamily);		/* Flawfinder: ignore */
+	snprintf(CPUInfo.strModel, sizeof(CPUInfo.strModel), "Model number %d", CPUInfo.uiModel);		/* Flawfinder: ignore */
 
 	// Nevertheless we can determine the processor type
     switch (CPUInfo.uiType)
@@ -1951,7 +1951,7 @@ const ProcessorInfo *CProcessor::GetCPUInfo()
 	if(l1dcachesize != 0)
 	{
 		CPUInfo._L1.Data.bPresent = true;
-		snprintf(CPUInfo._L1.Data.strSize, sizeof(CPUInfo._L1.Data.strSize), "%d KB", l1dcachesize / 1024);	/* Flawfinder: ignore */	
+		snprintf(CPUInfo._L1.Data.strSize, sizeof(CPUInfo._L1.Data.strSize), "%d KB", l1dcachesize / 1024);	/* Flawfinder: ignore */
 //		CPUInfo._L1.Data.uiAssociativeWays = ???;
 		CPUInfo._L1.Data.uiLineSize = cachelinesize;
 	}
@@ -1959,7 +1959,7 @@ const ProcessorInfo *CProcessor::GetCPUInfo()
 	if(l1icachesize != 0)
 	{
 		CPUInfo._L1.Instruction.bPresent = true;
-		snprintf(CPUInfo._L1.Instruction.strSize, sizeof(CPUInfo._L1.Instruction.strSize), "%d KB", l1icachesize / 1024);	/* Flawfinder: ignore */	
+		snprintf(CPUInfo._L1.Instruction.strSize, sizeof(CPUInfo._L1.Instruction.strSize), "%d KB", l1icachesize / 1024);	/* Flawfinder: ignore */
 //		CPUInfo._L1.Instruction.uiAssociativeWays = ???;
 		CPUInfo._L1.Instruction.uiLineSize = cachelinesize;
 	}
@@ -1967,7 +1967,7 @@ const ProcessorInfo *CProcessor::GetCPUInfo()
 	if(l2cachesize != 0)
 	{
 		CPUInfo._L2.bPresent = true;
-		snprintf(CPUInfo._L2.strSize, sizeof(CPUInfo._L2.strSize), "%d KB", l2cachesize / 1024);	/* Flawfinder: ignore */	
+		snprintf(CPUInfo._L2.strSize, sizeof(CPUInfo._L2.strSize), "%d KB", l2cachesize / 1024);	/* Flawfinder: ignore */
 //		CPUInfo._L2.uiAssociativeWays = ???;
 		CPUInfo._L2.uiLineSize = cachelinesize;
 	}
@@ -1975,7 +1975,7 @@ const ProcessorInfo *CProcessor::GetCPUInfo()
 	if(l3cachesize != 0)
 	{
 		CPUInfo._L2.bPresent = true;
-		snprintf(CPUInfo._L2.strSize, sizeof(CPUInfo._L2.strSize), "%d KB", l3cachesize / 1024);	/* Flawfinder: ignore */	
+		snprintf(CPUInfo._L2.strSize, sizeof(CPUInfo._L2.strSize), "%d KB", l3cachesize / 1024);	/* Flawfinder: ignore */
 //		CPUInfo._L2.uiAssociativeWays = ???;
 		CPUInfo._L2.uiLineSize = cachelinesize;
 	}