picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10795 from poettering/generator-fixes 

trivial fixes to some generators
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-11-16 14:30:53 +01:00 committed by GitHub
parent 524f8a4aea b39cfe21b4
commit 62adb5d085
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/manager.c
View File

@ -4453,7 +4453,7 @@ static void manager_deserialize_uid_refs_one_internal(
r = hashmap_replace(*uid_refs, UID_TO_PTR(uid), UINT32_TO_PTR(c));
if (r < 0) {
log_debug("Failed to add UID reference entry");
log_debug_errno(r, "Failed to add UID reference entry: %m");
return;
}
}

2
src/debug-generator/debug-generator.c
View File

@ -174,6 +174,8 @@ int main(int argc, char *argv[]) {
finish:
arg_default_unit = mfree(arg_default_unit);
strv_free(arg_wants);
strv_free(arg_mask);
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}

5
src/hibernate-resume/hibernate-resume-generator.c
View File

@ -95,10 +95,13 @@ int main(int argc, char *argv[]) {
if (arg_noresume) {
log_notice("Found \"noresume\" on the kernel command line, quitting.");
return EXIT_SUCCESS;
r = 0;
goto finish;
}
r = process_resume();
finish:
free(arg_resume_device);
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;