pass: Consolidate the size of char arrary to the 255 byte

The multiple modules define the char array with the different size.
It might make the confusion and overflow error. This patch consolidates
the size of char arrary to the 255 byte and changes the name of 'PASS_NAME_LEN'
to 'BUFF_MAX' in order to remove the unneeded 'PASS_*' prefix.

Change-Id: I2ee11313f10f52f5aa24628afbac9facd45b50ad
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/src/core/config-parser.c b/src/core/config-parser.c
index f1bc6f9..d0e2632 100644 (file)
--- a/src/core/config-parser.c
+++ b/src/core/config-parser.c
@@ -24,7 +24,7 @@
 
 #include "config-parser.h"
 
-#define MAX_LINE       128
+#define BUFF_MAX       255
 #define MAX_SECTION    64
 #define WHITESPACE     " \t"
 #define NEWLINE                "\n\r"
@@ -50,7 +50,7 @@ int config_parse(const char *file_name, int cb(struct parse_result *result,
        FILE *f = NULL;
        struct parse_result result;
        /* use stack for parsing */
-       char line[MAX_LINE];
+       char line[BUFF_MAX];
        char section[MAX_SECTION];
        char *start, *end, *name, *value;
        int lineno = 0, ret = 0;
@@ -68,7 +68,7 @@ int config_parse(const char *file_name, int cb(struct parse_result *result,
        }
 
        /* parsing line by line */
-       while (fgets(line, MAX_LINE, f) != NULL) {
+       while (fgets(line, BUFF_MAX, f) != NULL) {
                lineno++;
 
                start = line;

diff --git a/src/pass/pass-gov.h b/src/pass/pass-gov.h
index 6f17665..9bbbada 100644 (file)
--- a/src/pass/pass-gov.h
+++ b/src/pass/pass-gov.h
@@ -26,7 +26,7 @@ enum pass_gov_state {
 };
 
 struct pass_governor {
-       char name[PASS_NAME_LEN];
+       char name[BUFF_MAX];
        enum pass_gov_state gov_state;
 
        int (*init)(struct pass_policy *);

diff --git a/src/pass/pass-parser.c b/src/pass/pass-parser.c
index eb8e71a..121a606 100644 (file)
--- a/src/pass/pass-parser.c
+++ b/src/pass/pass-parser.c
@@ -28,7 +28,6 @@
 #include "core/config-parser.h"
 #include "hal/hal.h"
 
-#define BUFF_MAX                       255
 #define MAX_NUM                                255
 #define MIN_TIMEOUT_SEC                0.2
 
@@ -101,7 +100,7 @@ static int pass_parse_pmqos(struct parse_result *result, void *user_data,
 
        /* Parse 'Scenario' section */
        if (MATCH(result->name, "name")) {
-               snprintf(pmqos->scenarios[index].name, PASS_NAME_LEN, "%s",
+               snprintf(pmqos->scenarios[index].name, BUFF_MAX, "%s",
                                result->value);
        } else if (MATCH(result->name, "support")) {
                pmqos->scenarios[index].state = is_supported(result->value);
@@ -520,13 +519,13 @@ static int pass_parse_resource_data(struct parse_result *result,
                else
                        return -EINVAL;
        } else if (MATCH(result->name, "pass_res_name")) {
-               snprintf(conf_data->res_name, PASS_NAME_LEN, "%s", result->value);
+               snprintf(conf_data->res_name, BUFF_MAX, "%s", result->value);
        } else if (MATCH(result->name, "pass_res_thermal_name")) {
-               snprintf(conf_data->res_thermal_name, PASS_NAME_LEN, "%s", result->value);
+               snprintf(conf_data->res_thermal_name, BUFF_MAX, "%s", result->value);
        } else if (MATCH(result->name, "pass_path_conf_file")) {
-               snprintf(conf_data->path_conf_file, PASS_NAME_LEN, "%s", result->value);
+               snprintf(conf_data->path_conf_file, BUFF_MAX, "%s", result->value);
        } else if (MATCH(result->name, "pass_path_load_table")) {
-               snprintf(conf_data->path_load_table, PASS_NAME_LEN, "%s", result->value);
+               snprintf(conf_data->path_load_table, BUFF_MAX, "%s", result->value);
        } else if (MATCH(result->name, "pass_first_cpu")) {
                int res_type = conf_data->res_type;
 

diff --git a/src/pass/pass-pmqos.c b/src/pass/pass-pmqos.c
index da9fb77..ba9b7e7 100644 (file)
--- a/src/pass/pass-pmqos.c
+++ b/src/pass/pass-pmqos.c
@@ -107,7 +107,7 @@ int pass_notifier_pmqos_func(struct pass_policy *policy, void *data)
        struct pass_pmqos *pmqos;
        struct pass_scenario *scn = NULL;
        enum pass_state locked = PASS_UNUSED;
-       char name[PASS_NAME_LEN] = {""};
+       char name[BUFF_MAX] = {""};
        unsigned int new_level = 0;
        unsigned int min_level = 0;
        unsigned int max_level = 0;

diff --git a/src/pass/pass.h b/src/pass/pass.h
index 892a2c2..9f18fe1 100644 (file)
--- a/src/pass/pass.h
+++ b/src/pass/pass.h
@@ -26,10 +26,11 @@
 
 #include "shared/log.h"
 
+#define BUFF_MAX               255
+
 /******************************************************
  *                   PASS Governors                   *
  ******************************************************/
-#define PASS_NAME_LEN          128
 #define PASS_LEVEL_COND_MAX    3
 
 struct pass_policy;
@@ -181,7 +182,7 @@ struct pass_level {
  * @sequence: the sequence to turn on/off cpu
  */
 struct pass_hotplug {
-       char name[PASS_NAME_LEN];
+       char name[BUFF_MAX];
        unsigned int num_cpus;
        unsigned int online;
        unsigned int *sequence;
@@ -196,7 +197,7 @@ struct pass_freq_policy {
 };
 
 struct pass_scenario {
-       char name[PASS_NAME_LEN];
+       char name[BUFF_MAX];
        enum pass_state state;
        enum pass_state locked;
        int64_t locked_time;
@@ -290,10 +291,10 @@ struct pass_policy {
  */
 struct pass_conf_data {
        unsigned int res_type;
-       char res_name[PASS_NAME_LEN];
-       char res_thermal_name[PASS_NAME_LEN];
-       char path_conf_file[PASS_NAME_LEN];
-       char path_load_table[PASS_NAME_LEN];
+       char res_name[BUFF_MAX];
+       char res_thermal_name[BUFF_MAX];
+       char path_conf_file[BUFF_MAX];
+       char path_load_table[BUFF_MAX];
 
        unsigned int num_cpus;
        unsigned int cpu;