diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 02:47:02 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 02:47:02 -0500 |
| commit | a4d083550a7273b895b44aac8d2ff7e2fdb1f7d5 (patch) | |
| tree | 6f148433641f8c92d6f1eddcb2199a78dbd111a0 /src/debug-generator/debug-generator.c | |
| parent | b6d071f1df46eb841ba3f88cdb2b248eaf5f35f8 (diff) | |
| parent | 86e9bb69ae74bd960e1fd427258f41d54240d6d1 (diff) | |
Merge branch 'systemd/parabola' into notsystemd/premove
# Conflicts:
# Makefile.amp
Diffstat (limited to 'src/debug-generator/debug-generator.c')
| -rw-r--r-- | src/debug-generator/debug-generator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/debug-generator/debug-generator.c b/src/debug-generator/debug-generator.c index 7e80af78e7..7f11ec724d 100644 --- a/src/debug-generator/debug-generator.c +++ b/src/debug-generator/debug-generator.c @@ -33,7 +33,7 @@ static char **arg_mask = NULL; static char **arg_wants = NULL; static bool arg_debug_shell = false; -static int parse_proc_cmdline_item(const char *key, const char *value) { +static int parse_proc_cmdline_item(const char *key, const char *value, void *data) { int r; assert(key); @@ -178,7 +178,7 @@ int main(int argc, char *argv[]) { goto finish; } - r = parse_proc_cmdline(parse_proc_cmdline_item); + r = parse_proc_cmdline(parse_proc_cmdline_item, NULL, false); if (r < 0) log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m"); |