Setuid sandbox client class readability meta-CL

sandbox/linux/suid/client/setuid_sandbox_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
 #include "base/eintr_wrapper.h"
 #include "base/environment.h"
@@ skipping 10 matching lines @@
 // Set an environment variable that reflects the API version we expect from the
 // setuid sandbox. Old versions of the sandbox will ignore this.
 void SetSandboxAPIEnvironmentVariable(base::Environment* env) {
   env->SetVar(sandbox::kSandboxEnvironmentApiRequest,
               base::IntToString(sandbox::kSUIDSandboxApiNumber));
 }
 
 // Wrapper around a shared C function.
 // Returns the "saved" environment variable name corresponding to |envvar|
 // in a new string or NULL.
-std::string* CreateSavedVariableName(const char* envvar) {
-  char* const saved_env_var = SandboxSavedEnvironmentVariable(envvar);
+std::string* CreateSavedVariableName(const char* env_var) {
+  char* const saved_env_var = SandboxSavedEnvironmentVariable(env_var);
   if (!saved_env_var)
     return NULL;
   std::string* saved_env_var_copy = new std::string(saved_env_var);
   // SandboxSavedEnvironmentVariable is the C function that we wrap and uses
   // malloc() to allocate memory.
   free(saved_env_var);
   return saved_env_var_copy;
 }
 
 // The ELF loader will clear many environment variables so we save them to
 // different names here so that the SUID sandbox can resolve them for the
 // renderer.
 void SaveSUIDUnsafeEnvironmentVariables(base::Environment* env) {
   for (unsigned i = 0; kSUIDUnsafeEnvironmentVariables[i]; ++i) {
-    const char* const env_var = kSUIDUnsafeEnvironmentVariables[i];
+    const char* env_var = kSUIDUnsafeEnvironmentVariables[i];
     // Get the saved environment variable corresponding to envvar.
     scoped_ptr<std::string> saved_env_var(CreateSavedVariableName(env_var));
     if (saved_env_var == NULL)
       continue;
 
     std::string value;
     if (env->GetVar(env_var, &value))
       env->SetVar(saved_env_var->c_str(), value);
     else
       env->UnSetVar(saved_env_var->c_str());
@@ skipping 48 matching lines @@
 SetuidSandboxClient::SetuidSandboxClient()
     : env_(NULL),
       sandboxed_(false) {
 }
 
 SetuidSandboxClient::~SetuidSandboxClient() {
   delete env_;
 }
 
 bool SetuidSandboxClient::ChrootMe() {
-  int fd = GetIPCDescriptor(env_);
+  int ipc_fd = GetIPCDescriptor(env_);
 
-  if (fd < 0) {
+  if (ipc_fd < 0) {
     LOG(ERROR) << "Failed to obtain the sandbox IPC descriptor";
     return false;
   }
 
-  if (HANDLE_EINTR(write(fd, &kMsgChrootMe, 1)) != 1) {
+  if (HANDLE_EINTR(write(ipc_fd, &kMsgChrootMe, 1)) != 1) {
     PLOG(ERROR) << "Failed to write to chroot pipe";
     return false;
   }
 
   // We need to reap the chroot helper process in any event.
   pid_t helper_pid = GetHelperPID(env_);
   // If helper_pid is -1 we wait for any child.
   if (waitpid(helper_pid, NULL, 0) < 0) {
     PLOG(ERROR) << "Failed to wait for setuid helper to die";
     return false;
   }
 
   char reply;
-  if (HANDLE_EINTR(read(fd, &reply, 1)) != 1) {
+  if (HANDLE_EINTR(read(ipc_fd, &reply, 1)) != 1) {
     PLOG(ERROR) << "Failed to read from chroot pipe";
     return false;
   }
 
   if (reply != kMsgChrootSuccessful) {
     LOG(ERROR) << "Error code reply from chroot helper";
     return false;
   }
 
   // We now consider ourselves "fully sandboxed" as far as the
@@ skipping 21 matching lines @@
 bool SetuidSandboxClient::IsSandboxed() const {
   return sandboxed_;
 }
 
 void SetuidSandboxClient::SetupLaunchEnvironment() {
   SaveSUIDUnsafeEnvironmentVariables(env_);
   SetSandboxAPIEnvironmentVariable(env_);
 }
 
 }  // namespace sandbox
+