conf-parser: modernize config_section_new()

- add assertions,
- rename argument to store result.
This commit is contained in:
Yu Watanabe
2023-09-08 12:55:44 +09:00
parent 7bf9e0d5f6
commit 08ca764d0a
2 changed files with 7 additions and 4 deletions
+6 -3
View File
@@ -748,9 +748,13 @@ static int config_section_compare_func(const ConfigSection *x, const ConfigSecti
DEFINE_HASH_OPS(config_section_hash_ops, ConfigSection, config_section_hash_func, config_section_compare_func);
int config_section_new(const char *filename, unsigned line, ConfigSection **s) {
int config_section_new(const char *filename, unsigned line, ConfigSection **ret) {
ConfigSection *cs;
assert(filename);
assert(line > 0);
assert(ret);
cs = malloc0(offsetof(ConfigSection, filename) + strlen(filename) + 1);
if (!cs)
return -ENOMEM;
@@ -758,8 +762,7 @@ int config_section_new(const char *filename, unsigned line, ConfigSection **s) {
strcpy(cs->filename, filename);
cs->line = line;
*s = TAKE_PTR(cs);
*ret = TAKE_PTR(cs);
return 0;
}
+1 -1
View File
@@ -136,7 +136,7 @@ static inline ConfigSection* config_section_free(ConfigSection *cs) {
}
DEFINE_TRIVIAL_CLEANUP_FUNC(ConfigSection*, config_section_free);
int config_section_new(const char *filename, unsigned line, ConfigSection **s);
int config_section_new(const char *filename, unsigned line, ConfigSection **ret);
extern const struct hash_ops config_section_hash_ops;
unsigned hashmap_find_free_section_line(Hashmap *hashmap);