X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fconf-parser.h;h=019b7afd13bbdce46fac90c935ab5d0815949285;hp=2797076572b4830a5a9deb31a4a259704b619d2b;hb=88213476187cafc86bea2276199891873000588d;hpb=487393e9f11e4a06d91df03232914bd8c4b3368e diff --git a/src/conf-parser.h b/src/conf-parser.h index 279707657..019b7afd1 100644 --- a/src/conf-parser.h +++ b/src/conf-parser.h @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ #ifndef fooconfparserhfoo #define fooconfparserhfoo @@ -46,6 +46,7 @@ int config_parse(const char *filename, FILE *f, const char* const *sections, con /* Generic parsers */ int config_parse_int(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata); int config_parse_unsigned(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata); +int config_parse_uint64(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata); int config_parse_size(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata); int config_parse_bool(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata); int config_parse_string(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata); @@ -71,8 +72,8 @@ int config_parse_path_strv(const char *filename, unsigned line, const char *sect assert(data); \ \ if ((x = name##_from_string(rvalue)) < 0) { \ - log_error("[%s:%u] " msg ": %s", filename, line, rvalue); \ - return -EBADMSG; \ + log_error("[%s:%u] " msg ", ignoring: %s", filename, line, rvalue); \ + return 0; \ } \ \ *i = x; \ @@ -80,5 +81,4 @@ int config_parse_path_strv(const char *filename, unsigned line, const char *sect return 0; \ } - #endif