2169d2c18c
Resolves: RHEL-108555,RHEL-108568,RHEL-108576,RHEL-108584,RHEL-108596,RHEL-108598,RHEL-109096,RHEL-109488,RHEL-111065,RHEL-31756,RHEL-50103
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 14c6c9a0a58a99d66f541cec50a5cc860303ae7e Mon Sep 17 00:00:00 2001
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
Date: Sun, 29 Dec 2024 15:10:53 +0900
|
|
Subject: [PATCH] core,sd-bus: drop empty lines between function call and error
|
|
check
|
|
|
|
(cherry picked from commit 7baf4d234a70f136014f9e92f00c078a55c7adba)
|
|
|
|
Related: RHEL-31756
|
|
---
|
|
src/core/unit.c | 1 -
|
|
src/libsystemd/sd-bus/sd-bus.c | 1 -
|
|
2 files changed, 2 deletions(-)
|
|
|
|
diff --git a/src/core/unit.c b/src/core/unit.c
|
|
index dddaeb96f6..5a091b3bc4 100644
|
|
--- a/src/core/unit.c
|
|
+++ b/src/core/unit.c
|
|
@@ -3598,7 +3598,6 @@ int unit_install_bus_match(Unit *u, sd_bus *bus, const char *name) {
|
|
get_name_owner_handler,
|
|
u,
|
|
timeout_usec);
|
|
-
|
|
if (r < 0) {
|
|
u->match_bus_slot = sd_bus_slot_unref(u->match_bus_slot);
|
|
return r;
|
|
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
|
|
index b8406f154b..c2dded43ad 100644
|
|
--- a/src/libsystemd/sd-bus/sd-bus.c
|
|
+++ b/src/libsystemd/sd-bus/sd-bus.c
|
|
@@ -3542,7 +3542,6 @@ int bus_add_match_full(
|
|
add_match_callback,
|
|
s,
|
|
timeout_usec);
|
|
-
|
|
if (r < 0)
|
|
goto finish;
|
|
|