remove extra parentheses in return statement

[dpdk.git] / lib / librte_cfgfile / rte_cfgfile.c

diff --git a/lib/librte_cfgfile/rte_cfgfile.c b/lib/librte_cfgfile/rte_cfgfile.c
index 26052d0..1cd523f 100644 (file)
--- a/lib/librte_cfgfile/rte_cfgfile.c
+++ b/lib/librte_cfgfile/rte_cfgfile.c
@@ -92,7 +92,7 @@ rte_cfgfile_load(const char *filename, int flags)
        int allocated_entries = 0;
        int curr_section = -1;
        int curr_entry = -1;
-       char buffer[256];
+       char buffer[256] = {0};
        int lineno = 0;
        struct rte_cfgfile *cfg = NULL;
 
@@ -169,7 +169,7 @@ rte_cfgfile_load(const char *filename, int flags)
                                goto error1;
                        }
 
-                       rte_snprintf(cfg->sections[curr_section]->name,
+                       snprintf(cfg->sections[curr_section]->name,
                                        sizeof(cfg->sections[0]->name),
                                        "%s", &buffer[1]);
                } else {
@@ -213,9 +213,9 @@ rte_cfgfile_load(const char *filename, int flags)
 
                        struct rte_cfgfile_entry *entry = sect->entries[
                                curr_entry];
-                       rte_snprintf(entry->name, sizeof(entry->name), "%s",
+                       snprintf(entry->name, sizeof(entry->name), "%s",
                                split[0]);
-                       rte_snprintf(entry->value, sizeof(entry->value), "%s",
+                       snprintf(entry->value, sizeof(entry->value), "%s",
                                split[1]);
                        _strip(entry->name, strnlen(entry->name,
                                sizeof(entry->name)));
@@ -225,8 +225,10 @@ rte_cfgfile_load(const char *filename, int flags)
        }
        fclose(f);
        cfg->flags = flags;
-       cfg->sections[curr_section]->num_entries = curr_entry + 1;
        cfg->num_sections = curr_section + 1;
+       /* curr_section will still be -1 if we have an empty file */
+       if (curr_section >= 0)
+               cfg->sections[curr_section]->num_entries = curr_entry + 1;
        return cfg;
 
 error1:
@@ -283,7 +285,7 @@ rte_cfgfile_sections(struct rte_cfgfile *cfg, char *sections[],
        int i;
 
        for (i = 0; i < cfg->num_sections && i < max_sections; i++)
-               rte_snprintf(sections[i], CFG_NAME_LEN, "%s",
+               snprintf(sections[i], CFG_NAME_LEN, "%s",
                cfg->sections[i]->name);
 
        return i;
@@ -304,7 +306,7 @@ _get_section(struct rte_cfgfile *cfg, const char *sectionname)
 int
 rte_cfgfile_has_section(struct rte_cfgfile *cfg, const char *sectionname)
 {
-       return (_get_section(cfg, sectionname) != NULL);
+       return _get_section(cfg, sectionname) != NULL;
 }
 
 int
@@ -350,5 +352,5 @@ int
 rte_cfgfile_has_entry(struct rte_cfgfile *cfg, const char *sectionname,
                const char *entryname)
 {
-       return (rte_cfgfile_get_entry(cfg, sectionname, entryname) != NULL);
+       return rte_cfgfile_get_entry(cfg, sectionname, entryname) != NULL;
 }