commit b1d07441d04e4116638a1fc162cb7c6e55b2915a
author Jon Medhurst <tixy@linaro.org> Fri May 08 12:04:18 2015 +0100
committer Jon Medhurst <tixy@linaro.org> Fri May 08 12:04:18 2015 +0100
tree 21e00496086efa1b6627715e9d6b12f833be9c34
parent 96b56157b38cffced997ffa71fdd4bf71024fc67

gator: Version 5.21.1

Signed-off-by: Drew Richardson <drew.richardson@arm.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>

tools/gator/daemon/DynBuf.cpp

diff --git a/tools/gator/daemon/DynBuf.cpp b/tools/gator/daemon/DynBuf.cpp
index df20713..690cbcb 100644
--- a/tools/gator/daemon/DynBuf.cpp
+++ b/tools/gator/daemon/DynBuf.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) ARM Limited 2013-2014. All rights reserved.
+ * Copyright (C) ARM Limited 2013-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
@@ -42,7 +42,7 @@
 
 	const int fd = open(path, O_RDONLY | O_CLOEXEC);
 	if (fd < 0) {
-		logg->logMessage("%s(%s:%i): open failed", __FUNCTION__, __FILE__, __LINE__);
+		logg->logMessage("open failed");
 		return false;
 	}
 
@@ -52,14 +52,14 @@
 		const size_t minCapacity = length + MIN_BUFFER_FREE + 1;
 		if (capacity < minCapacity) {
 			if (resize(minCapacity) != 0) {
-				logg->logMessage("%s(%s:%i): DynBuf::resize failed", __FUNCTION__, __FILE__, __LINE__);
+				logg->logMessage("DynBuf::resize failed");
 				goto fail;
 			}
 		}
 
 		const ssize_t bytes = ::read(fd, buf + length, capacity - length - 1);
 		if (bytes < 0) {
-			logg->logMessage("%s(%s:%i): read failed", __FUNCTION__, __FILE__, __LINE__);
+			logg->logMessage("read failed");
 			goto fail;
 		} else if (bytes == 0) {
 			break;
@@ -105,7 +105,7 @@
 
 	if (capacity <= 0) {
 		if (resize(2 * MIN_BUFFER_FREE) != 0) {
-			logg->logMessage("%s(%s:%i): DynBuf::resize failed", __FUNCTION__, __FILE__, __LINE__);
+			logg->logMessage("DynBuf::resize failed");
 			return false;
 		}
 	}
@@ -114,13 +114,13 @@
 	int bytes = vsnprintf(buf, capacity, format, ap);
 	va_end(ap);
 	if (bytes < 0) {
-		logg->logMessage("%s(%s:%i): fsnprintf failed", __FUNCTION__, __FILE__, __LINE__);
+		logg->logMessage("fsnprintf failed");
 		return false;
 	}
 
 	if (static_cast<size_t>(bytes) > capacity) {
 		if (resize(bytes + 1) != 0) {
-			logg->logMessage("%s(%s:%i): DynBuf::resize failed", __FUNCTION__, __FILE__, __LINE__);
+			logg->logMessage("DynBuf::resize failed");
 			return false;
 		}
 
@@ -128,7 +128,7 @@
 		bytes = vsnprintf(buf, capacity, format, ap);
 		va_end(ap);
 		if (bytes < 0) {
-			logg->logMessage("%s(%s:%i): fsnprintf failed", __FUNCTION__, __FILE__, __LINE__);
+			logg->logMessage("fsnprintf failed");
 			return false;
 		}
 	}