commit 4d5dbb12d29b1aa0fbebbb51e8a086a1d10d13e9
author Yaowu Xu <yaowu@google.com> Fri Nov 08 11:13:32 2019 -0800
committer Yaowu Xu <yaowu@google.com> Fri Nov 08 22:12:40 2019 +0000
tree 5575574404bd6c76c47e9ca28d22b41cf209763a
parent f55d1944fa63b739eab392f4a90c1bdb9a1a14da

Rename variable pConfig to config

Following c/c++ coding style guide.

Change-Id: I6ce1d8cb0379679762c8393550fc0b476c0618e9

common/args.c

diff --git a/common/args.c b/common/args.c
index bf0b469..ade5e85 100644
--- a/common/args.c
+++ b/common/args.c
@@ -56,14 +56,14 @@
 static const char kMaxpartWarningString[] =
     "max_partition_size has to be smaller or equal to super_block_size.";
 
-int parse_cfg(const char *file, cfg_options_t *pConfig) {
+int parse_cfg(const char *file, cfg_options_t *config) {
   char line[1024 * 10];
   FILE *f = fopen(file, "r");
   if (!f) return 1;
 
 #define GET_PARAMS(field)          \
   if (strcmp(left, #field) == 0) { \
-    pConfig->field = atoi(right);  \
+    config->field = atoi(right);   \
     continue;                      \
   }
 
@@ -126,21 +126,21 @@
     exit(-1);
   }
 
-  if (pConfig->super_block_size != 128 && pConfig->super_block_size != 64) {
+  if (config->super_block_size != 128 && config->super_block_size != 64) {
     fprintf(stderr, "\n%s", kSbSizeWarningString);
     exit(-1);
   }
-  if (pConfig->min_partition_size > pConfig->max_partition_size) {
+  if (config->min_partition_size > config->max_partition_size) {
     fprintf(stderr, "\n%s", kMinpartWarningString);
     exit(-1);
   }
-  if (pConfig->max_partition_size > pConfig->super_block_size) {
+  if (config->max_partition_size > config->super_block_size) {
     fprintf(stderr, "\n%s", kMaxpartWarningString);
     exit(-1);
   }
 
   fclose(f);
-  pConfig->init_by_cfg_file = 1;
+  config->init_by_cfg_file = 1;
 
   return 0;
 }

common/args.h

diff --git a/common/args.h b/common/args.h
index fc289cf..286f7dd 100644
--- a/common/args.h
+++ b/common/args.h
@@ -53,7 +53,7 @@
 int arg_match(struct arg *arg_, const struct arg_def *def, char **argv);
 char *ignore_front_spaces(const char *str);
 void ignore_end_spaces(char *str);
-int parse_cfg(const char *file, cfg_options_t *pConfig);
+int parse_cfg(const char *file, cfg_options_t *config);
 const char *arg_next(struct arg *arg);
 void arg_show_usage(FILE *fp, const struct arg_def *const *defs);
 char **argv_dup(int argc, const char **argv);