systemd/backport-core-Move-r-variable-declaration-to-start-of-unit_st.patch
wangyuhang 5304d4b4cc backport: sync patches from systemd community; Fix compilation failure with - O0 option
(cherry picked from commit 112d69b7c80bafc341b94dbc98d8efd8c288f7a3)
2023-08-15 15:49:45 +08:00

34 lines
1.1 KiB
Diff

From 5f37c1a955e399756c4137d22f7f0f45a619f425 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 30 Oct 2021 22:12:06 +0100
Subject: [PATCH] core: Move 'r' variable declaration to start of unit_start()
Conflict:NA
Reference:https://github.com/systemd/systemd-stable/commit/5f37c1a955e399756c4137d22f7f0f45a619f425
---
src/core/unit.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/core/unit.c b/src/core/unit.c
index 4c55827a65..a2944c1917 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1851,12 +1851,13 @@ static bool unit_verify_deps(Unit *u) {
int unit_start(Unit *u) {
UnitActiveState state;
Unit *following;
+ int r;
assert(u);
/* Check start rate limiting early so that failure conditions don't cause us to enter a busy loop. */
if (UNIT_VTABLE(u)->test_start_limit) {
- int r = UNIT_VTABLE(u)->test_start_limit(u);
+ r = UNIT_VTABLE(u)->test_start_limit(u);
if (r < 0)
return r;
}
--
2.33.0