Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.

1 files changed, 8 insertions, 8 deletions

diff --git a/indra/llmessage/lldatapacker.cpp b/indra/llmessage/lldatapacker.cpp
index 627f77d4d8..10929dfbb2 100644
--- a/indra/llmessage/lldatapacker.cpp
+++ b/indra/llmessage/lldatapacker.cpp
@@ -524,7 +524,7 @@ const LLDataPackerBinaryBuffer&	LLDataPackerBinaryBuffer::operator=(const LLData
 		// We've got problems, ack!
 		llerrs << "Trying to do an assignment with not enough room in the target." << llendl;
 	}
-	memcpy(mBufferp, a.mBufferp, a.getBufferSize());
+	memcpy(mBufferp, a.mBufferp, a.getBufferSize());	/*Flawfinder: ignore*/
 	return *this;
 }
 
@@ -1217,7 +1217,7 @@ BOOL LLDataPackerAsciiBuffer::unpackUUID(LLUUID &value, const char *name)
 	}
 
 	char tmp_str[64];	/* Flawfinder: ignore */
-	sscanf(valuestr, "%63s", tmp_str);
+	sscanf(valuestr, "%63s", tmp_str);	/* Flawfinder: ignore */
 	value.set(tmp_str);
 
 	return success;
@@ -1239,7 +1239,7 @@ void LLDataPackerAsciiBuffer::writeIndentedName(const char *name)
 		}
 		else
 		{
-			numCopied = (S32)strlen(name) + 1; //name + tab            /* Flawfinder: ignore */
+			numCopied = (S32)strlen(name) + 1; 	/* Flawfinder: ignore */ //name + tab  	
 		}
 
 		// snprintf returns number of bytes that would have been written had the 
@@ -1269,9 +1269,9 @@ BOOL LLDataPackerAsciiBuffer::getValueStr(const char *name, char *out_value, S32
 		// Read both the name and the value, and validate the name.
 		sscanf(mCurBufferp, "%511[^\n]", buffer);
 		// Skip the \n
-		mCurBufferp += (S32)strlen(buffer) + 1;
+		mCurBufferp += (S32)strlen(buffer) + 1;	/* Flawfinder: ignore */
 
-		sscanf(buffer, "%511s %511[^\n]", keyword, value);
+		sscanf(buffer, "%511s %511[^\n]", keyword, value);	/* Flawfinder: ignore */
 
 		if (strcmp(keyword, name))
 		{
@@ -1775,7 +1775,7 @@ BOOL LLDataPackerAsciiFile::unpackUUID(LLUUID &value, const char *name)
 	}
 
 	char tmp_str[64]; /*Flawfinder: ignore */
-	sscanf(valuestr,"%63s",tmp_str);
+	sscanf(valuestr,"%63s",tmp_str);	/* Flawfinder: ignore */
 	value.set(tmp_str);
 
 	return success;
@@ -1819,7 +1819,7 @@ BOOL LLDataPackerAsciiFile::getValueStr(const char *name, char *out_value, S32 v
 		fgetpos(mFP, &last_pos);
 		fgets(buffer, DP_BUFSIZE, mFP);
 	
-		sscanf(buffer, "%511s %511[^\n]", keyword, value);
+		sscanf(buffer, "%511s %511[^\n]", keyword, value);	/* Flawfinder: ignore */
 	
 		if (!keyword[0])
 		{
@@ -1844,7 +1844,7 @@ BOOL LLDataPackerAsciiFile::getValueStr(const char *name, char *out_value, S32 v
 	{
 		mInputStream->getline(buffer, DP_BUFSIZE);
 	
-		sscanf(buffer, "%511s %511[^\n]", keyword, value);
+		sscanf(buffer, "%511s %511[^\n]", keyword, value);	/* Flawfinder: ignore */
 		if (!keyword[0])
 		{
 			llwarns << "Data packer could not get the keyword!" << llendl;