diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-05-12 15:27:07 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-05-12 15:27:07 -0700 |
commit | 0ed41f1a9564c0733ad155b742ac66fb41d2f9d3 (patch) | |
tree | fb32ef8d494ee1952b99a65f876a9e28da004a1b /tools/gator/daemon/LocalCapture.cpp | |
parent | a3d64deb4ee72f27441dd5363d74c294b7dd34a7 (diff) | |
parent | b93dcce48cc6182fcf66cb6d72665b10c775f4c3 (diff) |
Merge branch 'lsk-3.10-gator' of git://git.linaro.org/landing-teams/working/arm/kernel into v3.10/topic/gatorv3.10/topic/gator
* 'lsk-3.10-gator' of git://git.linaro.org/landing-teams/working/arm/kernel:
gator: Enable multiple source copies to exist in Android build environments
gator: Add config for building the module in-tree
gator: Version 5.21.1
Diffstat (limited to 'tools/gator/daemon/LocalCapture.cpp')
-rw-r--r-- | tools/gator/daemon/LocalCapture.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/gator/daemon/LocalCapture.cpp b/tools/gator/daemon/LocalCapture.cpp index d2a4b799d7ac..56899871c03a 100644 --- a/tools/gator/daemon/LocalCapture.cpp +++ b/tools/gator/daemon/LocalCapture.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 @@ -27,7 +27,7 @@ LocalCapture::~LocalCapture() {} void LocalCapture::createAPCDirectory(char* target_path) { gSessionData->mAPCDir = createUniqueDirectory(target_path, ".apc"); if ((removeDirAndAllContents(gSessionData->mAPCDir) != 0 || mkdir(gSessionData->mAPCDir, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0)) { - logg->logError(__FILE__, __LINE__, "Unable to create directory %s", gSessionData->mAPCDir); + logg->logError("Unable to create directory %s", gSessionData->mAPCDir); handleException(); } } @@ -40,7 +40,7 @@ void LocalCapture::write(char* string) { // Write the file if (util->writeToDisk(file, string) < 0) { - logg->logError(__FILE__, __LINE__, "Error writing %s\nPlease verify the path.", file); + logg->logError("Error writing %s\nPlease verify the path.", file); handleException(); } @@ -55,7 +55,7 @@ char* LocalCapture::createUniqueDirectory(const char* initialPath, const char* e // Ensure the path is an absolute path, i.e. starts with a slash if (initialPath == 0 || strlen(initialPath) == 0) { - logg->logError(__FILE__, __LINE__, "Missing -o command line option required for a local capture."); + logg->logError("Missing -o command line option required for a local capture."); handleException(); } else if (initialPath[0] != '/') { if (getcwd(path, PATH_MAX) == 0) { |