Skip to content

Commit 9fb5593

Browse files
committed
Addressing linter errors for using tabs instead of spaces
1 parent b3098f4 commit 9fb5593

1 file changed

Lines changed: 32 additions & 32 deletions

File tree

src/util/subprocess.h

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,11 @@ class OSError: public std::runtime_error
160160

161161
//Environment Variable types
162162
#ifndef _MSC_VER
163-
using env_string_t = std::string;
164-
using env_char_t = char;
163+
using env_string_t = std::string;
164+
using env_char_t = char;
165165
#else
166-
using env_string_t = std::wstring;
167-
using env_char_t = wchar_t;
166+
using env_string_t = std::wstring;
167+
using env_char_t = wchar_t;
168168
#endif
169169
using env_map_t = std::map<env_string_t, env_string_t>;
170170
using env_vector_t = std::vector<env_char_t>;
@@ -358,41 +358,41 @@ namespace util
358358
// * Returns the vector
359359
inline env_vector_t WindowsEnvironmentVectorFromMap(const env_map_t &source_map)
360360
{
361-
// Make a new environment map buffer.
362-
env_vector_t environment_map_buffer;
363-
// Give it some space.
364-
environment_map_buffer.reserve(4096);
365-
366-
// And fill'er up.
367-
for(auto kv: source_map){
368-
// Create the line
369-
env_string_t current_line(kv.first); current_line += L"="; current_line += kv.second;
370-
// Add the line to the buffer.
371-
std::copy(current_line.begin(), current_line.end(), std::back_inserter(environment_map_buffer));
372-
// Append a null
373-
environment_map_buffer.push_back(0);
374-
}
375-
// Append one last null because of how Windows does it's environment maps.
376-
environment_map_buffer.push_back(0);
377-
378-
return environment_map_buffer;
361+
// Make a new environment map buffer.
362+
env_vector_t environment_map_buffer;
363+
// Give it some space.
364+
environment_map_buffer.reserve(4096);
365+
366+
// And fill'er up.
367+
for(auto kv: source_map){
368+
// Create the line
369+
env_string_t current_line(kv.first); current_line += L"="; current_line += kv.second;
370+
// Add the line to the buffer.
371+
std::copy(current_line.begin(), current_line.end(), std::back_inserter(environment_map_buffer));
372+
// Append a null
373+
environment_map_buffer.push_back(0);
374+
}
375+
// Append one last null because of how Windows does it's environment maps.
376+
environment_map_buffer.push_back(0);
377+
378+
return environment_map_buffer;
379379
}
380380

381381
// env_vector_t CreateUpdatedWindowsEnvironmentVector(const env_map_t &changes_map)
382382
// * Merges host environment with new mapped variables
383383
// * Creates and returns string vector based on map
384384
inline env_vector_t CreateUpdatedWindowsEnvironmentVector(const env_map_t &changes_map){
385-
// Import the environment map
386-
env_map_t environment_map = MapFromWindowsEnvironment();
385+
// Import the environment map
386+
env_map_t environment_map = MapFromWindowsEnvironment();
387387
// Merge in the changes with overwrite
388-
for(auto& it: changes_map)
389-
{
390-
environment_map[it.first] = it.second;
391-
}
388+
for(auto& it: changes_map)
389+
{
390+
environment_map[it.first] = it.second;
391+
}
392392
// Create a Windows-usable Environment Map Buffer
393393
env_vector_t environment_map_strings_vector = WindowsEnvironmentVectorFromMap(environment_map);
394394

395-
return environment_map_strings_vector;
395+
return environment_map_strings_vector;
396396
}
397397

398398
#endif
@@ -1453,8 +1453,8 @@ inline void Popen::execute_process() noexcept(false)
14531453
void* environment_string_table_ptr = nullptr;
14541454
env_vector_t environment_string_vector;
14551455
if(this->env_.size()){
1456-
environment_string_vector = util::CreateUpdatedWindowsEnvironmentVector(env_);
1457-
environment_string_table_ptr = (void*)environment_string_vector.data();
1456+
environment_string_vector = util::CreateUpdatedWindowsEnvironmentVector(env_);
1457+
environment_string_table_ptr = (void*)environment_string_vector.data();
14581458
}
14591459

14601460
if (exe_name_.length()) {
@@ -1502,7 +1502,7 @@ inline void Popen::execute_process() noexcept(false)
15021502
NULL, // process security attributes
15031503
NULL, // primary thread security attributes
15041504
TRUE, // handles are inherited
1505-
creation_flags, // creation flags
1505+
creation_flags, // creation flags
15061506
environment_string_table_ptr, // use provided environment
15071507
NULL, // use parent's current directory
15081508
&siStartInfo, // STARTUPINFOW pointer

0 commit comments

Comments
 (0)