summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-11-16 14:30:53 +0100
committerGitHub <noreply@github.com>2018-11-16 14:30:53 +0100
commit62adb5d085fdbfdf5273f93ece1aa959113541cd (patch)
tree5a8c489989b19dd6a0d45730f7f0c4e576bb1959 /src
parent524f8a4aead3cbf415d6b36b667433e4133b16e8 (diff)
parentb39cfe21b43332165749f793043e81db8af7b5f8 (diff)
downloadsystemd-62adb5d085fdbfdf5273f93ece1aa959113541cd.tar.gz
systemd-62adb5d085fdbfdf5273f93ece1aa959113541cd.tar.bz2
systemd-62adb5d085fdbfdf5273f93ece1aa959113541cd.zip
Merge pull request #10795 from poettering/generator-fixes
trivial fixes to some generators
Diffstat (limited to 'src')
-rw-r--r--src/core/manager.c2
-rw-r--r--src/debug-generator/debug-generator.c2
-rw-r--r--src/hibernate-resume/hibernate-resume-generator.c5
3 files changed, 7 insertions, 2 deletions
diff --git a/src/core/manager.c b/src/core/manager.c
index d7dbf6c8a9..3150740e05 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -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;
}
}
diff --git a/src/debug-generator/debug-generator.c b/src/debug-generator/debug-generator.c
index 800d31cebe..a9497fe587 100644
--- a/src/debug-generator/debug-generator.c
+++ b/src/debug-generator/debug-generator.c
@@ -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;
}
diff --git a/src/hibernate-resume/hibernate-resume-generator.c b/src/hibernate-resume/hibernate-resume-generator.c
index 036493a389..bfee2fde31 100644
--- a/src/hibernate-resume/hibernate-resume-generator.c
+++ b/src/hibernate-resume/hibernate-resume-generator.c
@@ -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;