aboutsummaryrefslogtreecommitdiff
path: root/daemon/ConfigurationXML.cpp
diff options
context:
space:
mode:
authorDrew Richardson <drew.richardson@arm.com>2015-03-28 12:00:00 -0700
committerDrew Richardson <drew.richardson@arm.com>2015-04-01 14:41:00 -0700
commitabc3535c0d237bf7968b7092e545f2ff422af954 (patch)
tree778f83b3d8fd576762290b58b12c33cca5a193e1 /daemon/ConfigurationXML.cpp
parente8f6a181be0b67fc9d9ac117bc2ed01737be654c (diff)
gator: Version 5.215.21
Signed-off-by: Drew Richardson <drew.richardson@arm.com>
Diffstat (limited to 'daemon/ConfigurationXML.cpp')
-rw-r--r--daemon/ConfigurationXML.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/daemon/ConfigurationXML.cpp b/daemon/ConfigurationXML.cpp
index 6590dd3..be224a4 100644
--- a/daemon/ConfigurationXML.cpp
+++ b/daemon/ConfigurationXML.cpp
@@ -1,5 +1,5 @@
/**
- * Copyright (C) ARM Limited 2010-2014. All rights reserved.
+ * Copyright (C) ARM Limited 2010-2015. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -106,7 +106,7 @@ void ConfigurationXML::validate(void) {
const Counter & counter = gSessionData->mCounters[i];
if (counter.isEnabled()) {
if (strcmp(counter.getType(), "") == 0) {
- logg->logError(__FILE__, __LINE__, "Invalid required attribute in configuration.xml:\n counter=\"%s\"\n event=%d\n", counter.getType(), counter.getEvent());
+ logg->logError("Invalid required attribute in configuration.xml:\n counter=\"%s\"\n event=%d\n", counter.getType(), counter.getEvent());
handleException();
}
@@ -116,7 +116,7 @@ void ConfigurationXML::validate(void) {
if (counter2.isEnabled()) {
// check if the types are the same
if (strcmp(counter.getType(), counter2.getType()) == 0) {
- logg->logError(__FILE__, __LINE__, "Duplicate performance counter type in configuration.xml: %s", counter.getType());
+ logg->logError("Duplicate performance counter type in configuration.xml: %s", counter.getType());
handleException();
}
}
@@ -169,7 +169,7 @@ void ConfigurationXML::configurationTag(mxml_node_t *node) {
for (Driver *driver = Driver::getHead(); driver != NULL; driver = driver->getNext()) {
if (driver->claimCounter(counter)) {
if (counter.getDriver() != NULL) {
- logg->logError(__FILE__, __LINE__, "More than one driver has claimed %s:%i", counter.getType(), counter.getEvent());
+ logg->logError("More than one driver has claimed %s:%i", counter.getType(), counter.getEvent());
handleException();
}
counter.setDriver(driver);
@@ -210,7 +210,7 @@ void ConfigurationXML::remove() {
getPath(path);
if (::remove(path) != 0) {
- logg->logError(__FILE__, __LINE__, "Invalid configuration.xml file detected and unable to delete it. To resolve, delete configuration.xml on disk");
+ logg->logError("Invalid configuration.xml file detected and unable to delete it. To resolve, delete configuration.xml on disk");
handleException();
}
logg->logMessage("Invalid configuration.xml file detected and removed");