[libc-commits] [libc] 968c1aa - [libc][NFC] Use more common variable naming convention

[Alex Brachet via libc-commits]

Author: Alex Brachet
Date: 2022-03-16T03:34:54Z
New Revision: 968c1aa54fd7cd96bbfca24b287dd02ad2b58569

URL: https://github.com/llvm/llvm-project/commit/968c1aa54fd7cd96bbfca24b287dd02ad2b58569
DIFF: https://github.com/llvm/llvm-project/commit/968c1aa54fd7cd96bbfca24b287dd02ad2b58569.diff

LOG: [libc][NFC] Use more common variable naming convention

We were in between two styles when this file was initially
checked in.

Added: 
    

Modified: 
    libc/utils/testutils/ExecuteFunction.h
    libc/utils/testutils/ExecuteFunctionUnix.cpp

Removed: 
    


################################################################################
diff  --git a/libc/utils/testutils/ExecuteFunction.h b/libc/utils/testutils/ExecuteFunction.h
index a22336575d823..c120f1f50b8eb 100644
--- a/libc/utils/testutils/ExecuteFunction.h
+++ b/libc/utils/testutils/ExecuteFunction.h
@@ -40,10 +40,10 @@ struct ProcessStatus {
   int get_fatal_signal() const;
 };
 
-ProcessStatus invoke_in_subprocess(FunctionCaller *Func,
-                                   unsigned TimeoutMS = -1);
+ProcessStatus invoke_in_subprocess(FunctionCaller *func,
+                                   unsigned timeout_ms = -1);
 
-const char *signal_as_string(int Signum);
+const char *signal_as_string(int signum);
 
 } // namespace testutils
 } // namespace __llvm_libc

diff  --git a/libc/utils/testutils/ExecuteFunctionUnix.cpp b/libc/utils/testutils/ExecuteFunctionUnix.cpp
index a3871d07386d6..0076c3143ce83 100644
--- a/libc/utils/testutils/ExecuteFunctionUnix.cpp
+++ b/libc/utils/testutils/ExecuteFunctionUnix.cpp
@@ -35,50 +35,49 @@ int ProcessStatus::get_fatal_signal() const {
   return WTERMSIG(platform_defined);
 }
 
-ProcessStatus invoke_in_subprocess(FunctionCaller *Func, unsigned timeoutMS) {
-  std::unique_ptr<FunctionCaller> X(Func);
-  int pipeFDs[2];
-  if (::pipe(pipeFDs) == -1)
+ProcessStatus invoke_in_subprocess(FunctionCaller *func, unsigned timeout_ms) {
+  std::unique_ptr<FunctionCaller> X(func);
+  int pipe_fds[2];
+  if (::pipe(pipe_fds) == -1)
     return ProcessStatus::error("pipe(2) failed");
 
   // Don't copy the buffers into the child process and print twice.
   std::cout.flush();
   std::cerr.flush();
-  pid_t Pid = ::fork();
-  if (Pid == -1)
+  pid_t pid = ::fork();
+  if (pid == -1)
     return ProcessStatus::error("fork(2) failed");
 
-  if (!Pid) {
-    (*Func)();
+  if (!pid) {
+    (*func)();
     std::exit(0);
   }
-  ::close(pipeFDs[1]);
+  ::close(pipe_fds[1]);
 
-  struct pollfd pollFD {
-    pipeFDs[0], 0, 0
+  struct pollfd poll_fd {
+    pipe_fds[0], 0, 0
   };
   // No events requested so this call will only return after the timeout or if
   // the pipes peer was closed, signaling the process exited.
-  if (::poll(&pollFD, 1, timeoutMS) == -1)
+  if (::poll(&poll_fd, 1, timeout_ms) == -1)
     return ProcessStatus::error("poll(2) failed");
   // If the pipe wasn't closed by the child yet then timeout has expired.
-  if (!(pollFD.revents & POLLHUP)) {
-    ::kill(Pid, SIGKILL);
+  if (!(poll_fd.revents & POLLHUP)) {
+    ::kill(pid, SIGKILL);
     return ProcessStatus::timed_out_ps();
   }
 
-  int WStatus = 0;
+  int wstatus = 0;
   // Wait on the pid of the subprocess here so it gets collected by the system
   // and doesn't turn into a zombie.
-  pid_t status = ::waitpid(Pid, &WStatus, 0);
+  pid_t status = ::waitpid(pid, &wstatus, 0);
   if (status == -1)
     return ProcessStatus::error("waitpid(2) failed");
-  assert(status == Pid);
-  (void)status;
-  return {WStatus};
+  assert(status == pid);
+  return {wstatus};
 }
 
-const char *signal_as_string(int Signum) { return ::strsignal(Signum); }
+const char *signal_as_string(int signum) { return ::strsignal(signum); }
 
 } // namespace testutils
 } // namespace __llvm_libc