X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Finstall.c;h=75d6ca36192b9a1e59f6b3cef7e021af208230b4;hp=71e04335ef57371cd84d2c661ae419759fbaac3d;hb=e8e581bf256b8c0fbd430935af79fa0e8ee570a1;hpb=c1b6628d64e5340d905d974bb95d673a4aae60c1 diff --git a/src/shared/install.c b/src/shared/install.c index 71e04335e..75d6ca361 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -921,15 +921,15 @@ static int install_info_add_auto( return install_info_add(c, name_or_path, NULL); } -static int config_parse_also( - const char *filename, - unsigned line, - const char *section, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { +static int config_parse_also(const char *unit, + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { char *w; size_t l; @@ -956,15 +956,15 @@ static int config_parse_also( return 0; } -static int config_parse_user( - const char *filename, - unsigned line, - const char *section, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { +static int config_parse_user(const char *unit, + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { InstallInfo *i = data; char* printed; @@ -1016,7 +1016,8 @@ static int unit_file_load( return -ENOMEM; } - r = config_parse(path, f, NULL, config_item_table_lookup, (void*) items, true, info); + r = config_parse(NULL, path, f, NULL, + config_item_table_lookup, (void*) items, true, info); if (r < 0) return r;