Skip to content

Commit f47f3eb

Browse files
nit changes
1 parent 1fa69ee commit f47f3eb

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

resource_detectors/process_detector_utils.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# include <windows.h>
1313
# include <psapi.h>
1414
# include <shellapi.h>
15+
# pragma comment(lib, "shell32.lib")
1516
// clang-format on
1617
#else
1718
# include <sys/types.h>
@@ -92,7 +93,7 @@ std::vector<std::string> GetCommandWithArgs(const int32_t &pid)
9293
LPWSTR *argvW = CommandLineToArgvW(GetCommandLineW(), &argc);
9394
if (!argvW)
9495
{
95-
return {};
96+
return {}; // returns an empty vector if CommandLineToArgvW fails
9697
}
9798

9899
std::vector<std::string> args;

resource_detectors/test/process_detector_test.cc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
# include <process.h>
1313
# include <windows.h>
1414
# include <psapi.h>
15-
# include <shellapi.h>
16-
# pragma comment(lib, "shell32.lib")
1715
# define getpid _getpid
1816
// clang-format on
1917
#else
@@ -173,16 +171,18 @@ TEST(ProcessDetectorUtilsTest, GetCommandWithArgsTest)
173171
{
174172
args = {};
175173
}
176-
177-
for (int i = 0; i < argc; i++)
174+
else
178175
{
179-
// Convert UTF-16 to UTF-8
180-
int size_needed = WideCharToMultiByte(CP_UTF8, 0, argvW[i], -1, NULL, 0, NULL, NULL);
181-
if (size_needed > 0)
176+
for (int i = 0; i < argc; i++)
182177
{
183-
std::string arg(size_needed - 1, 0);
184-
WideCharToMultiByte(CP_UTF8, 0, argvW[i], -1, &arg[0], size_needed, NULL, NULL);
185-
args.push_back(arg);
178+
// Convert UTF-16 to UTF-8
179+
int size_needed = WideCharToMultiByte(CP_UTF8, 0, argvW[i], -1, NULL, 0, NULL, NULL);
180+
if (size_needed > 0)
181+
{
182+
std::string arg(size_needed - 1, 0);
183+
WideCharToMultiByte(CP_UTF8, 0, argvW[i], -1, &arg[0], size_needed, NULL, NULL);
184+
args.push_back(arg);
185+
}
186186
}
187187
}
188188

0 commit comments

Comments
 (0)