From fceae96eb171be0396512e251aab311d4e3ef9cc Mon Sep 17 00:00:00 2001
From: Karen Clark <karen@lindenlab.com>
Date: Tue, 20 Mar 2007 22:21:42 +0000
Subject: 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.
---
indra/llxml/llxmlnode.cpp | 4 ++--
indra/llxml/llxmlparser.cpp | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'indra/llxml')
diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp
index 131fb7bb3c..0415be8206 100644
--- a/indra/llxml/llxmlnode.cpp
+++ b/indra/llxml/llxmlnode.cpp
@@ -2143,7 +2143,7 @@ void LLXMLNode::setFloatValue(U32 length, const F32 *array, Encoding encoding, U
{
precision = 25;
}
- snprintf(format_string, sizeof(format_string), "%%.%dg", precision); /* Flawfinder: ignore */
+ snprintf(format_string, sizeof(format_string), "%%.%dg", precision); /* Flawfinder: ignore */
}
else
{
@@ -2194,7 +2194,7 @@ void LLXMLNode::setDoubleValue(U32 length, const F64 *array, Encoding encoding,
{
precision = 25;
}
- snprintf(format_string, sizeof(format_string), "%%.%dg", precision); /* Flawfinder: ignore */
+ snprintf(format_string, sizeof(format_string), "%%.%dg", precision); /* Flawfinder: ignore */
}
else
{
diff --git a/indra/llxml/llxmlparser.cpp b/indra/llxml/llxmlparser.cpp
index c3d791179a..e54b1c400d 100644
--- a/indra/llxml/llxmlparser.cpp
+++ b/indra/llxml/llxmlparser.cpp
@@ -57,7 +57,7 @@ BOOL LLXmlParser::parseFile(const std::string &path)
FILE* file = LLFile::fopen(path.c_str(), "rb"); /* Flawfinder: ignore */
if( !file )
{
- snprintf( mAuxErrorString, sizeof(mAuxErrorString), "Couldn't open file %s", path.c_str()); /* Flawfinder: ignore */
+ snprintf( mAuxErrorString, sizeof(mAuxErrorString), "Couldn't open file %s", path.c_str()); /* Flawfinder: ignore */
success = FALSE;
}
else
@@ -71,7 +71,7 @@ BOOL LLXmlParser::parseFile(const std::string &path)
void* buffer = XML_GetBuffer(mParser, buffer_size);
if( !buffer )
{
- snprintf( mAuxErrorString, sizeof(mAuxErrorString), "Unable to allocate XML buffer while reading file %s", path.c_str() ); /* Flawfinder: ignore */
+ snprintf( mAuxErrorString, sizeof(mAuxErrorString), "Unable to allocate XML buffer while reading file %s", path.c_str() ); /* Flawfinder: ignore */
success = FALSE;
goto exit_label;
}
@@ -79,14 +79,14 @@ BOOL LLXmlParser::parseFile(const std::string &path)
bytes_read = (S32)fread(buffer, 1, buffer_size, file);
if( bytes_read <= 0 )
{
- snprintf( mAuxErrorString, sizeof(mAuxErrorString), "Error while reading file %s", path.c_str() ); /* Flawfinder: ignore */
+ snprintf( mAuxErrorString, sizeof(mAuxErrorString), "Error while reading file %s", path.c_str() ); /* Flawfinder: ignore */
success = FALSE;
goto exit_label;
}
if( !XML_ParseBuffer(mParser, bytes_read, TRUE ) )
{
- snprintf( mAuxErrorString, sizeof(mAuxErrorString), "Error while parsing file %s", path.c_str() ); /* Flawfinder: ignore */
+ snprintf( mAuxErrorString, sizeof(mAuxErrorString), "Error while parsing file %s", path.c_str() ); /* Flawfinder: ignore */
success = FALSE;
}
--
cgit v1.2.3