gator: Version 5.21.1

Signed-off-by: Drew Richardson <drew.richardson@arm.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
diff --git a/tools/gator/daemon/Sender.cpp b/tools/gator/daemon/Sender.cpp
index 8a54a66..d7ad7571 100644
--- a/tools/gator/daemon/Sender.cpp
+++ b/tools/gator/daemon/Sender.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
@@ -30,7 +30,7 @@
 		// Streamline will send data prior to the magic sequence for legacy support, which should be ignored for v4+
 		while (strcmp("STREAMLINE", streamline) != 0) {
 			if (mDataSocket->receiveString(streamline, sizeof(streamline)) == -1) {
-				logg->logError(__FILE__, __LINE__, "Socket disconnected");
+				logg->logError("Socket disconnected");
 				handleException();
 			}
 		}
@@ -67,7 +67,7 @@
 	sprintf(mDataFileName, "%s/0000000000", apcDir);
 	mDataFile = fopen_cloexec(mDataFileName, "wb");
 	if (!mDataFile) {
-		logg->logError(__FILE__, __LINE__, "Failed to open binary file: %s", mDataFileName);
+		logg->logError("Failed to open binary file: %s", mDataFileName);
 		handleException();
 	}
 }
@@ -120,7 +120,7 @@
 		logg->logMessage("Writing data with length %d", length);
 		// Send data to the data file
 		if (fwrite(data, 1, length, mDataFile) != (unsigned int)length) {
-			logg->logError(__FILE__, __LINE__, "Failed writing binary file %s", mDataFileName);
+			logg->logError("Failed writing binary file %s", mDataFileName);
 			handleException();
 		}
 	}