Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
indra/llxml/llcontrol.cpp
View File

@@ -181,7 +181,7 @@ LLControlVariable::LLControlVariable(const std::string& name, eControlType type,
{
if (mPersist && mComment.empty())
{
llerrs << "Must supply a comment for control " << mName << llendl;
LL_ERRS() << "Must supply a comment for control " << mName << LL_ENDL;
}
//Push back versus setValue'ing here, since we don't want to call a signal yet
mValues.push_back(initial);
@@ -440,7 +440,7 @@ BOOL LLControlGroup::declareControl(const std::string& name, eControlType type,
}
else
{
llwarns << "Control named " << name << " already exists, ignoring new declaration." << llendl;
LL_WARNS() << "Control named " << name << " already exists, ignoring new declaration." << LL_ENDL;
}
return TRUE;
}
@@ -674,7 +674,7 @@ void LLControlGroup::setUntypedValue(const std::string& name, const LLSD& val)
}
else
{
CONTROL_ERRS << "Invalid control " << name << llendl;
CONTROL_ERRS << "Invalid control " << name << LL_ENDL;
}
}
@@ -692,14 +692,14 @@ U32 LLControlGroup::loadFromFileLegacy(const std::string& filename, BOOL require
if (!xml_controls.parseFile(filename))
{
llwarns << "Unable to open control file " << filename << llendl;
LL_WARNS() << "Unable to open control file " << filename << LL_ENDL;
return 0;
}
LLXmlTreeNode* rootp = xml_controls.getRoot();
if (!rootp || !rootp->hasAttribute("version"))
{
llwarns << "No valid settings header found in control file " << filename << llendl;
LL_WARNS() << "No valid settings header found in control file " << filename << LL_ENDL;
return 0;
}
@@ -712,7 +712,7 @@ U32 LLControlGroup::loadFromFileLegacy(const std::string& filename, BOOL require
// Check file version
if (version != CURRENT_VERSION)
{
llinfos << filename << " does not appear to be a version " << CURRENT_VERSION << " controls file" << llendl;
LL_INFOS() << filename << " does not appear to be a version " << CURRENT_VERSION << " controls file" << LL_ENDL;
return 0;
}
@@ -730,7 +730,7 @@ U32 LLControlGroup::loadFromFileLegacy(const std::string& filename, BOOL require
if (!name.empty())
{
//read in to end of line
llwarns << "LLControlGroup::loadFromFile() : Trying to set \"" << name << "\", setting doesn't exist." << llendl;
LL_WARNS() << "LLControlGroup::loadFromFile() : Trying to set \"" << name << "\", setting doesn't exist." << LL_ENDL;
}
child_nodep = rootp->getNextChild();
continue;
@@ -895,7 +895,7 @@ U32 LLControlGroup::saveToFile(const std::string& filename, BOOL nondefault_only
LLControlVariable* control = iter->second;
if (!control)
{
llwarns << "Tried to save invalid control: " << iter->first << llendl;
LL_WARNS() << "Tried to save invalid control: " << iter->first << LL_ENDL;
}
if( control && control->isPersisted() )
@@ -910,7 +910,7 @@ U32 LLControlGroup::saveToFile(const std::string& filename, BOOL nondefault_only
else
{
// Debug spam
// llinfos << "Skipping " << control->getName() << llendl;
// LL_INFOS() << "Skipping " << control->getName() << LL_ENDL;
}
}
}
@@ -920,12 +920,12 @@ U32 LLControlGroup::saveToFile(const std::string& filename, BOOL nondefault_only
{
LLSDSerialize::toPrettyXML(settings, file);
file.close();
llinfos << "Saved to " << filename << llendl;
LL_INFOS() << "Saved to " << filename << LL_ENDL;
}
else
{
// This is a warning because sometime we want to use settings files which can't be written...
llwarns << "Unable to open settings file: " << filename << llendl;
LL_WARNS() << "Unable to open settings file: " << filename << LL_ENDL;
return 0;
}
return num_saved;
@@ -941,7 +941,7 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v
infile.open(filename);
if(!infile.is_open())
{
llwarns << "Cannot find file " << filename << " to load." << llendl;
LL_WARNS() << "Cannot find file " << filename << " to load." << LL_ENDL;
return 0;
}
@@ -950,7 +950,7 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v
if (ret <= 0)
{
infile.close();
llwarns << "Unable to open LLSD control file " << filename << ". Trying Legacy Method." << llendl;
LL_WARNS() << "Unable to open LLSD control file " << filename << ". Trying Legacy Method." << LL_ENDL;
return loadFromFileLegacy(filename, TRUE, TYPE_STRING);
}
@@ -1016,9 +1016,9 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v
}
else
{
llerrs << "Mismatched type of control variable '"
LL_ERRS() << "Mismatched type of control variable '"
<< name << "' found while loading '"
<< filename << "'." << llendl;
<< filename << "'." << LL_ENDL;
}
}
else if(existing_control->isPersisted())
@@ -1184,7 +1184,7 @@ void main()
BOOL_CONTROL baz;
U32 count = gGlobals.loadFromFile("controls.ini");
llinfos << "Loaded " << count << " controls" << llendl;
LL_INFOS() << "Loaded " << count << " controls" << LL_ENDL;
// test insertion
foo = new LLControlVariable<F32>("gFoo", 5.f, 1.f, 20.f);
@@ -1341,7 +1341,7 @@ bool convert_from_llsd<bool>(const LLSD& sd, eControlType type, const std::strin
return sd.asBoolean();
else
{
CONTROL_ERRS << "Invalid BOOL value for " << control_name << ": " << sd << llendl;
CONTROL_ERRS << "Invalid BOOL value for " << control_name << ": " << sd << LL_ENDL;
return FALSE;
}
}
@@ -1353,7 +1353,7 @@ S32 convert_from_llsd<S32>(const LLSD& sd, eControlType type, const std::string&
return sd.asInteger();
else
{
CONTROL_ERRS << "Invalid S32 value for " << control_name << ": " << sd << llendl;
CONTROL_ERRS << "Invalid S32 value for " << control_name << ": " << sd << LL_ENDL;
return 0;
}
}
@@ -1365,7 +1365,7 @@ U32 convert_from_llsd<U32>(const LLSD& sd, eControlType type, const std::string&
return sd.asInteger();
else
{
CONTROL_ERRS << "Invalid U32 value for " << control_name << ": " << sd << llendl;
CONTROL_ERRS << "Invalid U32 value for " << control_name << ": " << sd << LL_ENDL;
return 0;
}
}
@@ -1377,7 +1377,7 @@ F32 convert_from_llsd<F32>(const LLSD& sd, eControlType type, const std::string&
return (F32) sd.asReal();
else
{
CONTROL_ERRS << "Invalid F32 value for " << control_name << ": " << sd << llendl;
CONTROL_ERRS << "Invalid F32 value for " << control_name << ": " << sd << LL_ENDL;
return 0.0f;
}
}
@@ -1389,7 +1389,7 @@ std::string convert_from_llsd<std::string>(const LLSD& sd, eControlType type, co
return sd.asString();
else
{
CONTROL_ERRS << "Invalid string value for " << control_name << ": " << sd << llendl;
CONTROL_ERRS << "Invalid string value for " << control_name << ": " << sd << LL_ENDL;
return LLStringUtil::null;
}
}
@@ -1407,7 +1407,7 @@ LLVector3 convert_from_llsd<LLVector3>(const LLSD& sd, eControlType type, const
return (LLVector3)sd;
else
{
CONTROL_ERRS << "Invalid LLVector3 value for " << control_name << ": " << sd << llendl;
CONTROL_ERRS << "Invalid LLVector3 value for " << control_name << ": " << sd << LL_ENDL;
return LLVector3::zero;
}
}
@@ -1419,7 +1419,7 @@ LLVector3d convert_from_llsd<LLVector3d>(const LLSD& sd, eControlType type, cons
return (LLVector3d)sd;
else
{
CONTROL_ERRS << "Invalid LLVector3d value for " << control_name << ": " << sd << llendl;
CONTROL_ERRS << "Invalid LLVector3d value for " << control_name << ": " << sd << LL_ENDL;
return LLVector3d::zero;
}
}
@@ -1431,7 +1431,7 @@ LLRect convert_from_llsd<LLRect>(const LLSD& sd, eControlType type, const std::s
return LLRect(sd);
else
{
CONTROL_ERRS << "Invalid rect value for " << control_name << ": " << sd << llendl;
CONTROL_ERRS << "Invalid rect value for " << control_name << ": " << sd << LL_ENDL;
return LLRect::null;
}
}
@@ -1445,26 +1445,26 @@ LLColor4 convert_from_llsd<LLColor4>(const LLSD& sd, eControlType type, const st
LLColor4 color(sd);
if (color.mV[VRED] < 0.f || color.mV[VRED] > 1.f)
{
llwarns << "Color " << control_name << " red value out of range: " << color << llendflush;
LL_WARNS() << "Color " << control_name << " red value out of range: " << color << LL_ENDL;
}
else if (color.mV[VGREEN] < 0.f || color.mV[VGREEN] > 1.f)
{
llwarns << "Color " << control_name << " green value out of range: " << color << llendflush;
LL_WARNS() << "Color " << control_name << " green value out of range: " << color << LL_ENDL;
}
else if (color.mV[VBLUE] < 0.f || color.mV[VBLUE] > 1.f)
{
llwarns << "Color " << control_name << " blue value out of range: " << color << llendflush;
LL_WARNS() << "Color " << control_name << " blue value out of range: " << color << LL_ENDL;
}
else if (color.mV[VALPHA] < 0.f || color.mV[VALPHA] > 1.f)
{
llwarns << "Color " << control_name << " alpha value out of range: " << color << llendflush;
LL_WARNS() << "Color " << control_name << " alpha value out of range: " << color << LL_ENDL;
}
return LLColor4(sd);
}
else
{
CONTROL_ERRS << "Control " << control_name << " not a color" << llendl;
CONTROL_ERRS << "Control " << control_name << " not a color" << LL_ENDL;
return LLColor4::white;
}
}
@@ -1476,7 +1476,7 @@ LLColor3 convert_from_llsd<LLColor3>(const LLSD& sd, eControlType type, const st
return sd;
else
{
CONTROL_ERRS << "Invalid LLColor3 value for " << control_name << ": " << sd << llendl;
CONTROL_ERRS << "Invalid LLColor3 value for " << control_name << ": " << sd << LL_ENDL;
return LLColor3::white;
}
}
@@ -1510,16 +1510,16 @@ void test_cached_control()
static const LLCachedControl<std::string> mySetting_string("TestCachedControlstring", "Default String Value");
static const LLCachedControl<std::string> test_BrowserHomePage("BrowserHomePage", "hahahahahha", "Not the real comment");
#define TEST_LLCC(T, V) if((T)mySetting_##T != V) llerrs << "Fail "#T << llendl; \
#define TEST_LLCC(T, V) if((T)mySetting_##T != V) LL_ERRS() << "Fail "#T << LL_ENDL; \
mySetting_##T = V;\
if((T)mySetting_##T != V) llerrs << "Fail "#T << "Pass # 2" << llendl;
if((T)mySetting_##T != V) LL_ERRS() << "Fail "#T << "Pass # 2" << LL_ENDL;
TEST_LLCC(U32, 666);
TEST_LLCC(S32, (S32)-666);
TEST_LLCC(F32, (F32)-666.666);
TEST_LLCC(bool, true);
TEST_LLCC(BOOL, FALSE);
if((std::string)mySetting_string != "Default String Value") llerrs << "Fail string" << llendl;
if((std::string)mySetting_string != "Default String Value") LL_ERRS() << "Fail string" << LL_ENDL;
TEST_LLCC(LLVector3, LLVector3(1.0f, 2.0f, 3.0f));
TEST_LLCC(LLVector3d, LLVector3d(6.0f, 5.0f, 4.0f));
TEST_LLCC(LLRect, LLRect(0, 0, 100, 500));
@@ -1527,7 +1527,7 @@ void test_cached_control()
TEST_LLCC(LLColor3, LLColor3(1.0f, 0.f, 0.5f));
//There's no LLSD comparsion for LLCC yet. TEST_LLCC(LLSD, test_llsd);
if((std::string)test_BrowserHomePage != "http://www.singularityviewer.org") llerrs << "Fail BrowserHomePage" << llendl;
if((std::string)test_BrowserHomePage != "http://www.singularityviewer.org") LL_ERRS() << "Fail BrowserHomePage" << LL_ENDL;
}
#endif // TEST_CACHED_CONTROL

12
indra/llxml/llcontrol.h
View File

@@ -198,7 +198,7 @@ typedef LLPointer<LLControlVariable> LLControlVariablePtr;
template <class T>
eControlType get_control_type()
{
llwarns << "Usupported control type: " << typeid(T).name() << "." << llendl;
LL_WARNS() << "Usupported control type: " << typeid(T).name() << "." << LL_ENDL;
return TYPE_COUNT;
}
@@ -293,7 +293,7 @@ public:
}
else
{
llwarns << "Control " << name << " not found." << llendl;
LL_WARNS() << "Control " << name << " not found." << LL_ENDL;
return T();
}
return convert_from_llsd<T>(value, type, name);
@@ -325,7 +325,7 @@ public:
}
else
{
llwarns << "Invalid control " << name << llendl;
LL_WARNS() << "Invalid control " << name << LL_ENDL;
}
}
@@ -380,10 +380,10 @@ public:
{
if(!group.controlExists(name))
{
//llerrs << "Control named " << name << " not found." << llendl;
//LL_ERRS() << "Control named " << name << " not found." << LL_ENDL;
if(!declareTypedControl(group, name, default_value, comment))
{
llerrs << "The control could not be created!!!" << llendl;
LL_ERRS() << "The control could not be created!!!" << LL_ENDL;
}
}
@@ -396,7 +396,7 @@ public:
{
if(!group.controlExists(name))
{
llerrs << "Control named " << name << " not found." << llendl;
LL_ERRS() << "Control named " << name << " not found." << LL_ENDL;
}
bindToControl(group, name);

96
indra/llxml/llxmlnode.cpp
View File

@@ -417,7 +417,7 @@ void XMLCALL StartXMLNode(void *userData,
if (NULL == parent)
{
llwarns << "parent (userData) is NULL; aborting function" << llendl;
LL_WARNS() << "parent (userData) is NULL; aborting function" << LL_ENDL;
return;
}
@@ -645,7 +645,7 @@ bool LLXMLNode::updateNode(
if (!node || !update_node)
{
llwarns << "Node invalid" << llendl;
LL_WARNS() << "Node invalid" << LL_ENDL;
return FALSE;
}
@@ -727,7 +727,7 @@ LLXMLNodePtr LLXMLNode::replaceNode(LLXMLNodePtr node, LLXMLNodePtr update_node)
{
if (!node || !update_node)
{
llwarns << "Node invalid" << llendl;
LL_WARNS() << "Node invalid" << LL_ENDL;
return node;
}
@@ -790,10 +790,10 @@ bool LLXMLNode::parseBuffer(
// Do the parsing
if (XML_Parse(my_parser, (const char *)buffer, length, TRUE) != XML_STATUS_OK)
{
llwarns << "Error parsing xml error code: "
LL_WARNS() << "Error parsing xml error code: "
<< XML_ErrorString(XML_GetErrorCode(my_parser))
<< " on line " << XML_GetCurrentLineNumber(my_parser)
<< llendl;
<< LL_ENDL;
}
// Deinit
@@ -801,8 +801,8 @@ bool LLXMLNode::parseBuffer(
if (!file_node->mChildren || file_node->mChildren->map.size() != 1)
{
llwarns << "Parse failure - wrong number of top-level nodes xml."
<< llendl;
LL_WARNS() << "Parse failure - wrong number of top-level nodes xml."
<< LL_ENDL;
node = NULL ;
return false;
}
@@ -845,10 +845,10 @@ bool LLXMLNode::parseStream(
if (XML_Parse(my_parser, (const char *)buffer, count, !str.good()) != XML_STATUS_OK)
{
llwarns << "Error parsing xml error code: "
LL_WARNS() << "Error parsing xml error code: "
<< XML_ErrorString(XML_GetErrorCode(my_parser))
<< " on lne " << XML_GetCurrentLineNumber(my_parser)
<< llendl;
<< LL_ENDL;
break;
}
}
@@ -860,8 +860,8 @@ bool LLXMLNode::parseStream(
if (!file_node->mChildren || file_node->mChildren->map.size() != 1)
{
llwarns << "Parse failure - wrong number of top-level nodes xml."
<< llendl;
LL_WARNS() << "Parse failure - wrong number of top-level nodes xml."
<< LL_ENDL;
node = NULL;
return false;
}
@@ -929,7 +929,7 @@ bool LLXMLNode::getLayeredXMLNode(LLXMLNodePtr& root,
if (!LLXMLNode::parseFile(filename, root, NULL))
{
llwarns << "Problem reading UI description file: " << filename << llendl;
LL_WARNS() << "Problem reading UI description file: " << filename << LL_ENDL;
return false;
}
@@ -949,7 +949,7 @@ bool LLXMLNode::getLayeredXMLNode(LLXMLNodePtr& root,
if (!LLXMLNode::parseFile(layer_filename, updateRoot, NULL))
{
llwarns << "Problem reading localized UI description file: " << layer_filename << llendl;
LL_WARNS() << "Problem reading localized UI description file: " << layer_filename << LL_ENDL;
return false;
}
@@ -982,7 +982,7 @@ void LLXMLNode::writeToFile(LLFILE *out_file, const std::string& indent, bool us
size_t written = fwrite(outstring.c_str(), 1, outstring.length(), out_file);
if (written != outstring.length())
{
llwarns << "Short write" << llendl;
LL_WARNS() << "Short write" << LL_ENDL;
}
}
@@ -1818,9 +1818,9 @@ U32 LLXMLNode::getBoolValue(U32 expected_length, BOOL *array)
#if LL_DEBUG
if (ret_length != expected_length)
{
lldebugs << "LLXMLNode::getBoolValue() failed for node named '"
LL_DEBUGS() << "LLXMLNode::getBoolValue() failed for node named '"
<< mName->mString << "' -- expected " << expected_length << " but "
<< "only found " << ret_length << llendl;
<< "only found " << ret_length << LL_ENDL;
}
#endif
return ret_length;
@@ -1839,8 +1839,8 @@ U32 LLXMLNode::getByteValue(U32 expected_length, U8 *array, Encoding encoding)
if (mLength > 0 && mLength != expected_length)
{
llwarns << "XMLNode::getByteValue asked for " << expected_length
<< " elements, while node has " << mLength << llendl;
LL_WARNS() << "XMLNode::getByteValue asked for " << expected_length
<< " elements, while node has " << mLength << LL_ENDL;
return 0;
}
@@ -1863,7 +1863,7 @@ U32 LLXMLNode::getByteValue(U32 expected_length, U8 *array, Encoding encoding)
}
if (value > 255 || is_negative)
{
llwarns << "getByteValue: Value outside of valid range." << llendl;
LL_WARNS() << "getByteValue: Value outside of valid range." << LL_ENDL;
break;
}
array[i] = U8(value);
@@ -1871,9 +1871,9 @@ U32 LLXMLNode::getByteValue(U32 expected_length, U8 *array, Encoding encoding)
#if LL_DEBUG
if (i != expected_length)
{
lldebugs << "LLXMLNode::getByteValue() failed for node named '"
LL_DEBUGS() << "LLXMLNode::getByteValue() failed for node named '"
<< mName->mString << "' -- expected " << expected_length << " but "
<< "only found " << i << llendl;
<< "only found " << i << LL_ENDL;
}
#endif
return i;
@@ -1891,8 +1891,8 @@ U32 LLXMLNode::getIntValue(U32 expected_length, S32 *array, Encoding encoding)
if (mLength > 0 && mLength != expected_length)
{
llwarns << "XMLNode::getIntValue asked for " << expected_length
<< " elements, while node has " << mLength << llendl;
LL_WARNS() << "XMLNode::getIntValue asked for " << expected_length
<< " elements, while node has " << mLength << LL_ENDL;
return 0;
}
@@ -1915,7 +1915,7 @@ U32 LLXMLNode::getIntValue(U32 expected_length, S32 *array, Encoding encoding)
}
if (value > 0x7fffffff)
{
llwarns << "getIntValue: Value outside of valid range." << llendl;
LL_WARNS() << "getIntValue: Value outside of valid range." << LL_ENDL;
break;
}
array[i] = S32(value) * (is_negative?-1:1);
@@ -1924,9 +1924,9 @@ U32 LLXMLNode::getIntValue(U32 expected_length, S32 *array, Encoding encoding)
#if LL_DEBUG
if (i != expected_length)
{
lldebugs << "LLXMLNode::getIntValue() failed for node named '"
LL_DEBUGS() << "LLXMLNode::getIntValue() failed for node named '"
<< mName->mString << "' -- expected " << expected_length << " but "
<< "only found " << i << llendl;
<< "only found " << i << LL_ENDL;
}
#endif
return i;
@@ -1944,8 +1944,8 @@ U32 LLXMLNode::getUnsignedValue(U32 expected_length, U32 *array, Encoding encodi
if (mLength > 0 && mLength != expected_length)
{
llwarns << "XMLNode::getUnsignedValue asked for " << expected_length
<< " elements, while node has " << mLength << llendl;
LL_WARNS() << "XMLNode::getUnsignedValue asked for " << expected_length
<< " elements, while node has " << mLength << LL_ENDL;
return 0;
}
@@ -1969,7 +1969,7 @@ U32 LLXMLNode::getUnsignedValue(U32 expected_length, U32 *array, Encoding encodi
}
if (is_negative || value > 0xffffffff)
{
llwarns << "getUnsignedValue: Value outside of valid range." << llendl;
LL_WARNS() << "getUnsignedValue: Value outside of valid range." << LL_ENDL;
break;
}
array[i] = U32(value);
@@ -1978,9 +1978,9 @@ U32 LLXMLNode::getUnsignedValue(U32 expected_length, U32 *array, Encoding encodi
#if LL_DEBUG
if (i != expected_length)
{
lldebugs << "LLXMLNode::getUnsignedValue() failed for node named '"
LL_DEBUGS() << "LLXMLNode::getUnsignedValue() failed for node named '"
<< mName->mString << "' -- expected " << expected_length << " but "
<< "only found " << i << llendl;
<< "only found " << i << LL_ENDL;
}
#endif
@@ -1999,7 +1999,7 @@ U32 LLXMLNode::getLongValue(U32 expected_length, U64 *array, Encoding encoding)
if (mLength > 0 && mLength != expected_length)
{
llwarns << "XMLNode::getLongValue asked for " << expected_length << " elements, while node has " << mLength << llendl;
LL_WARNS() << "XMLNode::getLongValue asked for " << expected_length << " elements, while node has " << mLength << LL_ENDL;
return 0;
}
@@ -2023,7 +2023,7 @@ U32 LLXMLNode::getLongValue(U32 expected_length, U64 *array, Encoding encoding)
}
if (is_negative)
{
llwarns << "getLongValue: Value outside of valid range." << llendl;
LL_WARNS() << "getLongValue: Value outside of valid range." << LL_ENDL;
break;
}
array[i] = value;
@@ -2032,9 +2032,9 @@ U32 LLXMLNode::getLongValue(U32 expected_length, U64 *array, Encoding encoding)
#if LL_DEBUG
if (i != expected_length)
{
lldebugs << "LLXMLNode::getLongValue() failed for node named '"
LL_DEBUGS() << "LLXMLNode::getLongValue() failed for node named '"
<< mName->mString << "' -- expected " << expected_length << " but "
<< "only found " << i << llendl;
<< "only found " << i << LL_ENDL;
}
#endif
@@ -2053,7 +2053,7 @@ U32 LLXMLNode::getFloatValue(U32 expected_length, F32 *array, Encoding encoding)
if (mLength > 0 && mLength != expected_length)
{
llwarns << "XMLNode::getFloatValue asked for " << expected_length << " elements, while node has " << mLength << llendl;
LL_WARNS() << "XMLNode::getFloatValue asked for " << expected_length << " elements, while node has " << mLength << LL_ENDL;
return 0;
}
@@ -2078,9 +2078,9 @@ U32 LLXMLNode::getFloatValue(U32 expected_length, F32 *array, Encoding encoding)
#if LL_DEBUG
if (i != expected_length)
{
lldebugs << "LLXMLNode::getFloatValue() failed for node named '"
LL_DEBUGS() << "LLXMLNode::getFloatValue() failed for node named '"
<< mName->mString << "' -- expected " << expected_length << " but "
<< "only found " << i << llendl;
<< "only found " << i << LL_ENDL;
}
#endif
return i;
@@ -2098,7 +2098,7 @@ U32 LLXMLNode::getDoubleValue(U32 expected_length, F64 *array, Encoding encoding
if (mLength > 0 && mLength != expected_length)
{
llwarns << "XMLNode::getDoubleValue asked for " << expected_length << " elements, while node has " << mLength << llendl;
LL_WARNS() << "XMLNode::getDoubleValue asked for " << expected_length << " elements, while node has " << mLength << LL_ENDL;
return 0;
}
@@ -2123,9 +2123,9 @@ U32 LLXMLNode::getDoubleValue(U32 expected_length, F64 *array, Encoding encoding
#if LL_DEBUG
if (i != expected_length)
{
lldebugs << "LLXMLNode::getDoubleValue() failed for node named '"
LL_DEBUGS() << "LLXMLNode::getDoubleValue() failed for node named '"
<< mName->mString << "' -- expected " << expected_length << " but "
<< "only found " << i << llendl;
<< "only found " << i << LL_ENDL;
}
#endif
return i;
@@ -2139,7 +2139,7 @@ U32 LLXMLNode::getStringValue(U32 expected_length, std::string *array)
if (mLength > 0 && mLength != expected_length)
{
llwarns << "XMLNode::getStringValue asked for " << expected_length << " elements, while node has " << mLength << llendl;
LL_WARNS() << "XMLNode::getStringValue asked for " << expected_length << " elements, while node has " << mLength << LL_ENDL;
return 0;
}
@@ -2171,9 +2171,9 @@ U32 LLXMLNode::getStringValue(U32 expected_length, std::string *array)
#if LL_DEBUG
if (num_returned_strings != expected_length)
{
lldebugs << "LLXMLNode::getStringValue() failed for node named '"
LL_DEBUGS() << "LLXMLNode::getStringValue() failed for node named '"
<< mName->mString << "' -- expected " << expected_length << " but "
<< "only found " << num_returned_strings << llendl;
<< "only found " << num_returned_strings << LL_ENDL;
}
#endif
@@ -2216,9 +2216,9 @@ U32 LLXMLNode::getUUIDValue(U32 expected_length, LLUUID *array)
#if LL_DEBUG
if (i != expected_length)
{
lldebugs << "LLXMLNode::getUUIDValue() failed for node named '"
LL_DEBUGS() << "LLXMLNode::getUUIDValue() failed for node named '"
<< mName->mString << "' -- expected " << expected_length << " but "
<< "only found " << i << llendl;
<< "only found " << i << LL_ENDL;
}
#endif
return i;
@@ -2247,11 +2247,11 @@ U32 LLXMLNode::getNodeRefValue(U32 expected_length, LLXMLNode **array)
root->findID(string_array[strnum], node_list);
if (node_list.empty())
{
llwarns << "XML: Could not find node ID: " << string_array[strnum] << llendl;
LL_WARNS() << "XML: Could not find node ID: " << string_array[strnum] << LL_ENDL;
}
else if (node_list.size() > 1)
{
llwarns << "XML: Node ID not unique: " << string_array[strnum] << llendl;
LL_WARNS() << "XML: Node ID not unique: " << string_array[strnum] << LL_ENDL;
}
else
{

2
indra/llxml/llxmlparser.cpp
View File

@@ -127,7 +127,7 @@ exit_label:
if( !success )
{
llwarns << mAuxErrorString << llendl;
LL_WARNS() << mAuxErrorString << LL_ENDL;
}
return success;

42
indra/llxml/llxmltree.cpp
View File

@@ -73,7 +73,7 @@ BOOL LLXmlTree::parseFile(const std::string &path, BOOL keep_contents)
{
S32 line_number = parser.getCurrentLineNumber();
const char* error = parser.getErrorString();
llwarns << "LLXmlTree parse failed. Line " << line_number << ": " << error << llendl;
LL_WARNS() << "LLXmlTree parse failed. Line " << line_number << ": " << error << LL_ENDL;
}
return success;
}
@@ -95,7 +95,7 @@ bool LLXmlTree::parseBuffer(const char *buf, int len)
if (!success) {
S32 line_number = mParser->getCurrentLineNumber();
const char* error = mParser->getErrorString();
llwarns << "LLXmlTree parse failed in line " << line_number << ": " << error << llendl;
LL_WARNS() << "LLXmlTree parse failed in line " << line_number << ": " << error << LL_ENDL;
delete mParser;
mParser = 0;
}
@@ -171,19 +171,19 @@ LLXmlTreeNode::~LLXmlTreeNode()
void LLXmlTreeNode::dump( const std::string& prefix )
{
llinfos << prefix << mName ;
LL_INFOS() << prefix << mName ;
if( !mContents.empty() )
{
llcont << " contents = \"" << mContents << "\"";
LL_CONT << " contents = \"" << mContents << "\"";
}
attribute_map_t::iterator iter;
for (iter=mAttributes.begin(); iter != mAttributes.end(); iter++)
{
LLStdStringHandle key = iter->first;
const std::string* value = iter->second;
llcont << prefix << " " << key << "=" << (value->empty() ? "NULL" : *value);
LL_CONT << prefix << " " << key << "=" << (value->empty() ? "NULL" : *value);
}
llcont << llendl;
LL_CONT << LL_ENDL;
}
void LLXmlTreeNode::writeNoChild(std::string &buffer, const std::string &indent) const
@@ -666,12 +666,12 @@ void LLXmlTreeParser::startElement(const char* name, const char **atts)
{
if( mDump )
{
llinfos << tabs() << "startElement " << name << llendl;
LL_INFOS() << tabs() << "startElement " << name << LL_ENDL;
S32 i = 0;
while( atts[i] && atts[i+1] )
{
llinfos << tabs() << "attribute: " << atts[i] << "=" << atts[i+1] << llendl;
LL_INFOS() << tabs() << "attribute: " << atts[i] << "=" << atts[i+1] << LL_ENDL;
i += 2;
}
}
@@ -708,7 +708,7 @@ void LLXmlTreeParser::endElement(const char* name)
{
if( mDump )
{
llinfos << tabs() << "endElement " << name << llendl;
LL_INFOS() << tabs() << "endElement " << name << LL_ENDL;
}
if( !mCurrent->mContents.empty() )
@@ -726,7 +726,7 @@ void LLXmlTreeParser::characterData(const char *s, int len)
if (s) str = std::string(s, len);
if( mDump )
{
llinfos << tabs() << "CharacterData " << str << llendl;
LL_INFOS() << tabs() << "CharacterData " << str << LL_ENDL;
}
if (mKeepContents)
@@ -739,7 +739,7 @@ void LLXmlTreeParser::processingInstruction(const char *target, const char *data
{
if( mDump )
{
llinfos << tabs() << "processingInstruction " << data << llendl;
LL_INFOS() << tabs() << "processingInstruction " << data << LL_ENDL;
}
}
@@ -747,7 +747,7 @@ void LLXmlTreeParser::comment(const char *data)
{
if( mDump )
{
llinfos << tabs() << "comment " << data << llendl;
LL_INFOS() << tabs() << "comment " << data << LL_ENDL;
}
}
@@ -755,7 +755,7 @@ void LLXmlTreeParser::startCdataSection()
{
if( mDump )
{
llinfos << tabs() << "startCdataSection" << llendl;
LL_INFOS() << tabs() << "startCdataSection" << LL_ENDL;
}
}
@@ -763,7 +763,7 @@ void LLXmlTreeParser::endCdataSection()
{
if( mDump )
{
llinfos << tabs() << "endCdataSection" << llendl;
LL_INFOS() << tabs() << "endCdataSection" << LL_ENDL;
}
}
@@ -773,7 +773,7 @@ void LLXmlTreeParser::defaultData(const char *s, int len)
{
std::string str;
if (s) str = std::string(s, len);
llinfos << tabs() << "defaultData " << str << llendl;
LL_INFOS() << tabs() << "defaultData " << str << LL_ENDL;
}
}
@@ -786,12 +786,12 @@ void LLXmlTreeParser::unparsedEntityDecl(
{
if( mDump )
{
llinfos << tabs() << "unparsed entity:" << llendl;
llinfos << tabs() << " entityName " << entity_name << llendl;
llinfos << tabs() << " base " << base << llendl;
llinfos << tabs() << " systemId " << system_id << llendl;
llinfos << tabs() << " publicId " << public_id << llendl;
llinfos << tabs() << " notationName " << notation_name<< llendl;
LL_INFOS() << tabs() << "unparsed entity:" << LL_ENDL;
LL_INFOS() << tabs() << " entityName " << entity_name << LL_ENDL;
LL_INFOS() << tabs() << " base " << base << LL_ENDL;
LL_INFOS() << tabs() << " systemId " << system_id << LL_ENDL;
LL_INFOS() << tabs() << " publicId " << public_id << LL_ENDL;
LL_INFOS() << tabs() << " notationName " << notation_name<< LL_ENDL;
}
}

2
indra/llxml/llxmltree.h
View File

@@ -32,7 +32,7 @@
#include <list>
#include "llstring.h"
#include "llxmlparser.h"
#include "string_table.h"
#include "llstringtable.h"
class LLColor4;
class LLColor4U;