Fixed variable names according to Google C++ style.
Trivia question: what do you get when Java developers refactor C into C++?
Anser: a_bigMess
BUG: 26379932
Test: DumpstateTest passes
Change-Id: I64c00f3b5953f077fb646cdc45a1656060a4b46e
diff --git a/cmds/dumpstate/dumpstate.h b/cmds/dumpstate/dumpstate.h
index e7dd6e8..29d3c0b 100644
--- a/cmds/dumpstate/dumpstate.h
+++ b/cmds/dumpstate/dumpstate.h
@@ -119,9 +119,9 @@
long timeout_;
bool always_;
- RootMode rootMode_;
- StdoutMode stdoutMode_;
- std::string loggingMessage_;
+ RootMode root_mode_;
+ StdoutMode stdout_mode_;
+ std::string logging_message_;
friend class CommandOptions;
friend class CommandOptionsBuilder;
@@ -129,7 +129,7 @@
CommandOptions(const CommandOptionsValues& values);
- const CommandOptionsValues values_;
+ const CommandOptionsValues values;
public:
class CommandOptionsBuilder {
@@ -150,7 +150,7 @@
private:
CommandOptionsBuilder(long timeout);
- CommandOptionsValues values_;
+ CommandOptionsValues values;
friend class CommandOptions;
};
@@ -249,12 +249,12 @@
* description).
* |dumpsys_args| `dumpsys` arguments (except `-t`).
* |options| optional argument defining the command's behavior.
- * |dumpsysTimeout| when > 0, defines the value passed to `dumpsys -t` (otherwise it uses the
+ * |dumpsys_timeout| when > 0, defines the value passed to `dumpsys -t` (otherwise it uses the
* timeout from `options`)
*/
- void RunDumpsys(const std::string& title, const std::vector<std::string>& dumpsysArgs,
+ void RunDumpsys(const std::string& title, const std::vector<std::string>& dumpsys_args,
const CommandOptions& options = CommandOptions::DEFAULT_DUMPSYS,
- long dumpsysTimeout = 0);
+ long dumpsys_timeout = 0);
/*
* Prints the contents of a file.
@@ -317,19 +317,19 @@
unsigned long id_;
// Whether progress updates should be published.
- bool updateProgress_ = false;
+ bool update_progress_ = false;
// Whether it should take an screenshot earlier in the process.
- bool doEarlyScreenshot_ = false;
+ bool do_early_screenshot_ = false;
// Currrent progress.
int progress_ = 0;
// Total estimated progress.
- int weightTotal_ = WEIGHT_TOTAL;
+ int weight_total_ = WEIGHT_TOTAL;
// When set, defines a socket file-descriptor use to report progress to bugreportz.
- int controlSocketFd_ = -1;
+ int control_socket_fd_ = -1;
// Bugreport format version;
std::string version_ = VERSION_DEFAULT;
@@ -338,39 +338,39 @@
std::string args_;
// Extra options passed as system property.
- std::string extraOptions_;
+ std::string extra_options_;
// Full path of the directory where the bugreport files will be written.
- std::string bugreportDir_;
+ std::string bugreport_dir_;
// Full path of the temporary file containing the screenshot (when requested).
- std::string screenshotPath_;
+ std::string screenshot_path_;
time_t now_;
// Base name (without suffix or extensions) of the bugreport files, typically
// `bugreport-BUILD_ID`.
- std::string baseName_;
+ std::string base_name_;
// Name is the suffix part of the bugreport files - it's typically the date (when invoked with
// `-d`), but it could be changed by the user..
std::string name_;
// Full path of the temporary file containing the bugreport.
- std::string tmp_path;
+ std::string tmp_path_;
// Full path of the file containing the dumpstate logs.
- std::string log_path;
+ std::string log_path_;
// Pointer to the actual path, be it zip or text.
- std::string path;
+ std::string path_;
// Pointer to the zipped file.
std::unique_ptr<FILE, int (*)(FILE*)> zip_file{nullptr, fclose};
private:
// Used by GetInstance() only.
- Dumpstate(bool dryRun = false, const std::string& buildType = "user");
+ Dumpstate(bool dry_run = false, const std::string& build_type = "user");
// Internal version of RunCommand that just runs it, without updating progress.
int JustRunCommand(const char* command, const char* path, std::vector<const char*>& args,
@@ -380,10 +380,10 @@
int JustDumpFile(const std::string& title, const std::string& path) const;
// Whether this is a dry run.
- bool dryRun_;
+ bool dry_run_;
// Build type (such as 'user' or 'eng').
- std::string buildType_;
+ std::string build_type_;
};
// for_each_pid_func = void (*)(int, const char*);