diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-09-17 10:00:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-17 10:00:19 +0200 |
| commit | 6ac288a990251b39218fa219f03a2048124b9352 (patch) | |
| tree | ffb840c43202f5d9b479045e59652e4862a96000 /src/shared/conf-parser.h | |
| parent | 0b493a02631d08bd2f48db8bc618dcd1fe3bdcb3 (diff) | |
| parent | 881e6b5edfd6ff82e0683678f19c887cbacab344 (diff) | |
Merge pull request #4123 from keszybz/network-file-dropins
Network file dropins
Diffstat (limited to 'src/shared/conf-parser.h')
| -rw-r--r-- | src/shared/conf-parser.h | 48 |
1 files changed, 30 insertions, 18 deletions
diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h index 3298dc0cea..26ff3df16f 100644 --- a/src/shared/conf-parser.h +++ b/src/shared/conf-parser.h @@ -84,24 +84,36 @@ int config_item_table_lookup(const void *table, const char *section, const char * ConfigPerfItem tables */ int config_item_perf_lookup(const void *table, const char *section, const char *lvalue, ConfigParserCallback *func, int *ltype, void **data, void *userdata); -int config_parse(const char *unit, - const char *filename, - FILE *f, - const char *sections, /* nulstr */ - ConfigItemLookup lookup, - const void *table, - bool relaxed, - bool allow_include, - bool warn, - void *userdata); - -int config_parse_many(const char *conf_file, /* possibly NULL */ - const char *conf_file_dirs, /* nulstr */ - const char *sections, /* nulstr */ - ConfigItemLookup lookup, - const void *table, - bool relaxed, - void *userdata); +int config_parse( + const char *unit, + const char *filename, + FILE *f, + const char *sections, /* nulstr */ + ConfigItemLookup lookup, + const void *table, + bool relaxed, + bool allow_include, + bool warn, + void *userdata); + +int config_parse_many_nulstr( + const char *conf_file, /* possibly NULL */ + const char *conf_file_dirs, /* nulstr */ + const char *sections, /* nulstr */ + ConfigItemLookup lookup, + const void *table, + bool relaxed, + void *userdata); + +int config_parse_many( + const char *conf_file, /* possibly NULL */ + const char* const* conf_file_dirs, + const char *dropin_dirname, + const char *sections, /* nulstr */ + ConfigItemLookup lookup, + const void *table, + bool relaxed, + void *userdata); /* Generic parsers */ int config_parse_int(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); |