From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 15 Mar 2019 10:01:12 +0000 (+0900)
Subject: core: use TAKE_PTR() at few more places
X-Git-Tag: v242-rc1~7^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49052946c91d37c6537de81180f10e662c7c7872;p=thirdparty%2Fsystemd.git

core: use TAKE_PTR() at few more places
---

diff --git a/src/core/main.c b/src/core/main.c
index 981513bbc3b..1617b237672 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1908,9 +1908,8 @@ static int invoke_main_loop(
                         *ret_shutdown_verb = NULL;
 
                         /* Steal the switch root parameters */
-                        *ret_switch_root_dir = m->switch_root;
-                        *ret_switch_root_init = m->switch_root_init;
-                        m->switch_root = m->switch_root_init = NULL;
+                        *ret_switch_root_dir = TAKE_PTR(m->switch_root);
+                        *ret_switch_root_init = TAKE_PTR(m->switch_root_init);
 
                         return 0;