[llvm-commits] [llvm] r76229 - in /llvm/trunk: include/llvm/System/Program.h lib/System/Unix/Program.inc
Mikhail Glushenkov
foldr at codedgers.com
Fri Jul 17 13:38:43 PDT 2009
Author: foldr
Date: Fri Jul 17 15:38:17 2009
New Revision: 76229
URL: http://llvm.org/viewvc/llvm-project?rev=76229&view=rev
Log:
Trailing whitespace.
Modified:
llvm/trunk/include/llvm/System/Program.h
llvm/trunk/lib/System/Unix/Program.inc
Modified: llvm/trunk/include/llvm/System/Program.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/System/Program.h?rev=76229&r1=76228&r2=76229&view=diff
==============================================================================
--- llvm/trunk/include/llvm/System/Program.h (original)
+++ llvm/trunk/include/llvm/System/Program.h Fri Jul 17 15:38:17 2009
@@ -97,12 +97,12 @@
/// called then a std::string is thrown.
/// @returns an integer result code indicating the status of the program.
/// A zero or positive value indicates the result code of the program. A
- /// negative value is the signal number on which it terminated.
+ /// negative value is the signal number on which it terminated.
/// @see FindProgrambyName
/// @brief Executes the program with the given set of \p args.
static void ExecuteNoWait(
- const Path& path, ///< sys::Path object providing the path of the
- ///< program to be executed. It is presumed this is the result of
+ const Path& path, ///< sys::Path object providing the path of the
+ ///< program to be executed. It is presumed this is the result of
///< the FindProgramByName method.
const char** args, ///< A vector of strings that are passed to the
///< program. The first element should be the name of the program.
@@ -120,7 +120,7 @@
///< higher limit, the child is killed and this call returns. If zero -
///< no memory limit.
std::string* ErrMsg = 0 ///< If non-zero, provides a pointer to a string
- ///< instance in which error messages will be returned. If the string
+ ///< instance in which error messages will be returned. If the string
///< is non-empty upon return an error occurred while invoking the
///< program.
);
Modified: llvm/trunk/lib/System/Unix/Program.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/System/Unix/Program.inc?rev=76229&r1=76228&r2=76229&view=diff
==============================================================================
--- llvm/trunk/lib/System/Unix/Program.inc (original)
+++ llvm/trunk/lib/System/Unix/Program.inc Fri Jul 17 15:38:17 2009
@@ -1,10 +1,10 @@
//===- llvm/System/Unix/Program.cpp -----------------------------*- C++ -*-===//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file implements the Unix specific portion of the Program class.
@@ -51,10 +51,10 @@
return temp;
// At this point, the file name is valid and its not executable
-
+
// Get the path. If its empty, we can't do anything to find it.
const char *PathStr = getenv("PATH");
- if (PathStr == 0)
+ if (PathStr == 0)
return Path();
// Now we have a colon separated list of directories to search; try them.
@@ -142,14 +142,14 @@
#endif
}
-int
-Program::ExecuteAndWait(const Path& path,
+int
+Program::ExecuteAndWait(const Path& path,
const char** args,
const char** envp,
const Path** redirects,
unsigned secondsToWait,
unsigned memoryLimit,
- std::string* ErrMsg)
+ std::string* ErrMsg)
{
if (!path.canExecute()) {
if (ErrMsg)
@@ -174,7 +174,7 @@
if (RedirectIO(redirects[0], 0, ErrMsg)) { return -1; }
// Redirect stdout
if (RedirectIO(redirects[1], 1, ErrMsg)) { return -1; }
- if (redirects[1] && redirects[2] &&
+ if (redirects[1] && redirects[2] &&
*(redirects[1]) == *(redirects[2])) {
// If stdout and stderr should go to the same place, redirect stderr
// to the FD already open for stdout.
@@ -192,7 +192,7 @@
if (memoryLimit!=0) {
SetMemoryLimits(memoryLimit);
}
-
+
// Execute!
if (envp != 0)
execve (path.c_str(), (char**)args, (char**)envp);
@@ -233,7 +233,7 @@
if (secondsToWait && errno == EINTR) {
// Kill the child.
kill(child, SIGKILL);
-
+
// Turn off the alarm and restore the signal handler
alarm(0);
sigaction(SIGALRM, &Old, 0);
@@ -271,16 +271,16 @@
#else
return -99;
#endif
-
+
}
void
-Program::ExecuteNoWait(const Path& path,
+Program::ExecuteNoWait(const Path& path,
const char** args,
const char** envp,
const Path** redirects,
unsigned memoryLimit,
- std::string* ErrMsg)
+ std::string* ErrMsg)
{
if (!path.canExecute()) {
if (ErrMsg)
@@ -304,7 +304,7 @@
if (RedirectIO(redirects[0], 0, ErrMsg)) { return; }
// Redirect stdout
if (RedirectIO(redirects[1], 1, ErrMsg)) { return; }
- if (redirects[1] && redirects[2] &&
+ if (redirects[1] && redirects[2] &&
*(redirects[1]) == *(redirects[2])) {
// If stdout and stderr should go to the same place, redirect stderr
// to the FD already open for stdout.
@@ -322,7 +322,7 @@
if (memoryLimit!=0) {
SetMemoryLimits(memoryLimit);
}
-
+
// Execute!
if (envp != 0)
execve (path.c_str(), (char**)args, (char**)envp);
More information about the llvm-commits
mailing list