[RunLAA] Cleanup.

syzygy/runlaa/runlaa_app.cc

 // Copyright 2015 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 171 matching lines @@
 
 int RunLaaApp::Run() {
   // If an expected mode has been specified then run a self-test and return
   // the result.
   if (!expect_mode_.empty()) {
     if (SelfTest(expect_mode_))
       return 0;
     return 1;
   }
 
-  bool is_laa = false;
-  if (!GetLaaBit(image_, &is_laa))
+  bool was_laa = false;
+  if (!GetLaaBit(image_, &was_laa))
     return 1;
 
   base::ScopedTempDir scoped_temp_dir;
   base::FilePath child_image(image_);
   bool toggle_back = false;
 
-  if (is_laa == is_laa_) {
+  if (was_laa == is_laa_) {
     LOG(INFO) << "Image already in desired mode, running directly.";
   } else {
     // The image is not in the desired mode. It needs to be toggled.
     if (in_place_) {
       // Try our best not to modify the currently running executable.
       base::FilePath exe_path;
       if (PathService::Get(base::FILE_EXE, &exe_path)) {
         exe_path = base::MakeAbsoluteFilePath(exe_path);
         core::FilePathCompareResult result =
             core::CompareFilePaths(exe_path, image_);
         if (result == core::kEquivalentFilePaths) {
           LOG(ERROR) << "Unable to modify running executable in-place.";
           return 1;
         }
       }
 
       // The work is occurring in place and the image needs to be toggled back.
       toggle_back = true;
     } else {
       // The work is not to happen in place. Create a temp directory and copy
-      // the
-      // image.
+      // the image.
       if (!scoped_temp_dir.CreateUniqueTempDir()) {
         LOG(ERROR) << "Failed to create temp directory.";
         return 1;
       }
 
       // Take ownership of the temp directory if it is to be left around.
       base::FilePath temp_dir = scoped_temp_dir.path();
       if (keep_temp_dir_) {
         temp_dir = scoped_temp_dir.Take();
         LOG(INFO) << "Temporary directory will be preserved: "
@@ skipping 37 matching lines @@
     LOG(INFO) << "Toggling back LargeAddressAware bit.";
     if (!ToggleLaaBit(child_image))
       return 1;
   }
 
   // Return the exit code of the child process.
   return exit_code;
 }
 
 }  // namespace runlaa