diff options
author | Drew Richardson <drew.richardson@arm.com> | 2015-03-28 12:00:00 -0700 |
---|---|---|
committer | Drew Richardson <drew.richardson@arm.com> | 2015-04-01 14:41:00 -0700 |
commit | abc3535c0d237bf7968b7092e545f2ff422af954 (patch) | |
tree | 778f83b3d8fd576762290b58b12c33cca5a193e1 /daemon/Command.cpp | |
parent | e8f6a181be0b67fc9d9ac117bc2ed01737be654c (diff) |
gator: Version 5.215.21
Signed-off-by: Drew Richardson <drew.richardson@arm.com>
Diffstat (limited to 'daemon/Command.cpp')
-rw-r--r-- | daemon/Command.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/daemon/Command.cpp b/daemon/Command.cpp index 28d73cf..0a6e3b9 100644 --- a/daemon/Command.cpp +++ b/daemon/Command.cpp @@ -1,5 +1,5 @@ /** - * Copyright (C) ARM Limited 2014. All rights reserved. + * Copyright (C) ARM Limited 2014-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 @@ -39,7 +39,7 @@ static int getUid(const char *const name, char *const shPath, const char *const const int pid = fork(); if (pid < 0) { - logg->logError(__FILE__, __LINE__, "fork failed"); + logg->logError("fork failed"); handleException(); } if (pid == 0) { @@ -94,7 +94,7 @@ void *commandThread(void *) { const char *const name = gSessionData->mCaptureUser == NULL ? "nobody" : gSessionData->mCaptureUser; const int uid = getUid(name); if (uid < 0) { - logg->logError(__FILE__, __LINE__, "Unable to lookup the user %s, please double check that the user exists", name); + logg->logError("Unable to look up the user %s, please double check that the user exists", name); handleException(); } @@ -103,13 +103,13 @@ void *commandThread(void *) { char buf[128]; int pipefd[2]; if (pipe_cloexec(pipefd) != 0) { - logg->logError(__FILE__, __LINE__, "pipe failed"); + logg->logError("pipe failed"); handleException(); } const int pid = fork(); if (pid < 0) { - logg->logError(__FILE__, __LINE__, "fork failed"); + logg->logError("fork failed"); handleException(); } if (pid == 0) { @@ -163,7 +163,7 @@ void *commandThread(void *) { close(pipefd[1]); const ssize_t bytes = read(pipefd[0], buf, sizeof(buf)); if (bytes > 0) { - logg->logError(__FILE__, __LINE__, buf); + logg->logError("%s", buf); handleException(); } close(pipefd[0]); |