doc: add Meson coding style to contributors guide

[dpdk.git] / lib / librte_power / power_pstate_cpufreq.c

diff --git a/lib/librte_power/power_pstate_cpufreq.c b/lib/librte_power/power_pstate_cpufreq.c
index c4639e4..2cfc54a 100644 (file)
--- a/lib/librte_power/power_pstate_cpufreq.c
+++ b/lib/librte_power/power_pstate_cpufreq.c
@@ -175,6 +175,11 @@ power_init_for_setting_freq(struct pstate_power_info *pi)
        FOPEN_OR_ERR_RET(f_base_max, -1);
        if (f_base_max != NULL) {
                s_base_max = fgets(buf_base, sizeof(buf_base), f_base_max);
+
+               /* close the file unconditionally */
+               fclose(f_base_max);
+               f_base_max = NULL;
+
                FOPS_OR_NULL_GOTO(s_base_max, out);
 
                buf_base[BUFSIZ-1] = '\0';
@@ -220,7 +225,6 @@ power_init_for_setting_freq(struct pstate_power_info *pi)
 
                base_ratio = strtoul(buf_base, NULL, POWER_CONVERT_TO_DECIMAL)
                                / BUS_FREQ;
-               fclose(f_base);
        }
 
        /* Add MSR read to detect turbo status */
@@ -382,6 +386,9 @@ power_set_governor_performance(struct pstate_power_info *pi)
        /* Strip off terminating '\n' */
        strtok(buf, "\n");
 
+       /* Save the original governor */
+       rte_strscpy(pi->governor_ori, buf, sizeof(pi->governor_ori));
+
        /* Check if current governor is performance */
        if (strncmp(buf, POWER_GOVERNOR_PERF,
                        sizeof(POWER_GOVERNOR_PERF)) == 0) {
@@ -390,8 +397,6 @@ power_set_governor_performance(struct pstate_power_info *pi)
                                "already performance\n", pi->lcore_id);
                goto out;
        }
-       /* Save the original governor */
-       strlcpy(pi->governor_ori, buf, sizeof(pi->governor_ori));
 
        /* Write 'performance' to the governor */
        val = fseek(f, 0, SEEK_SET);