ini.c: remove final callback call
Storing repo information removes the need for the final callback. This allows the call signature to be re-purposed for indicating read errors. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
This commit is contained in:
parent
7ed0d60a0d
commit
9eb07a81fa
|
@ -902,9 +902,7 @@ static int _parse_directive(const char *file, int linenum, const char *name,
|
|||
if(!key && !value) {
|
||||
section->name = name;
|
||||
pm_printf(ALPM_LOG_DEBUG, "config: new section '%s'\n", name);
|
||||
if(!name) {
|
||||
/* end of file, do nothing */
|
||||
} else if(strcmp(name, "options") == 0) {
|
||||
if(strcmp(name, "options") == 0) {
|
||||
section->repo = NULL;
|
||||
} else {
|
||||
section->repo = calloc(sizeof(config_repo_t), 1);
|
||||
|
|
|
@ -172,10 +172,6 @@ static int _parse_ini(const char *file, ini_parser_fn cb, void *data,
|
|||
}
|
||||
}
|
||||
|
||||
if(depth == 0) {
|
||||
ret = cb(NULL, 0, NULL, NULL, NULL, data);
|
||||
}
|
||||
|
||||
cleanup:
|
||||
if(fp) {
|
||||
fclose(fp);
|
||||
|
@ -199,8 +195,7 @@ cleanup:
|
|||
* otherwise
|
||||
*
|
||||
* @note The callback will be called at the beginning of each section with an
|
||||
* empty key and value, for each key/value pair, and when parsing is complete
|
||||
* with all arguments except @a data empty.
|
||||
* empty key and value and for each key/value pair.
|
||||
*
|
||||
* @note The @a key and @a value passed to @ cb will be overwritten between
|
||||
* calls. The section name will remain valid until after @a cb is called to
|
||||
|
|
Loading…
Reference in New Issue