gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Util

Browse Source 
- Made arg vector const.
- Applied coding conventions.
This commit is contained in:
Paul Beckingham
2014-08-30 23:27:49 -04:00
parent ff8bc79b8f
commit 820c327a81
2 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/util.cpp
View File

@@ -392,7 +392,7 @@ void combine (std::vector <int>& dest, const std::vector <int>& source)
// Run an external executable with execvp. This means stdio goes to // Run an external executable with execvp. This means stdio goes to
// the child process, so that it can receive user input (e.g. passwords). // the child process, so that it can receive user input (e.g. passwords).
// //
int execute(const std::string& executable, std::vector<std::string> arguments) int execute (const std::string& executable, const std::vector<std::string>& arguments)
{ {
if (executable == "") if (executable == "")
return -1; return -1;
@@ -404,11 +404,9 @@ int execute(const std::string& executable, std::vector<std::string> arguments)
std::string cmdline = executable; std::string cmdline = executable;
std::vector <std::string>::iterator it; std::vector <std::string>::const_iterator it;
for (it = arguments.begin (); it != arguments.end (); ++it) for (it = arguments.begin (); it != arguments.end (); ++it)
{
cmdline += " " + (std::string) *it; cmdline += " " + (std::string) *it;
}
context.debug ("Executing: " + std::string (shell) + " " + std::string (opt) + " " + cmdline); context.debug ("Executing: " + std::string (shell) + " " + std::string (opt) + " " + cmdline);

2
src/util.h
View File

@@ -52,7 +52,7 @@ void uuid_unparse_lower (uuid_t uu, char *out);
#endif #endif
const std::string uuid (); const std::string uuid ();
int execute (const std::string&, std::vector<std::string>); int execute (const std::string&, const std::vector <std::string>&);
#ifdef SOLARIS #ifdef SOLARIS
#define LOCK_SH 1 #define LOCK_SH 1