From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 20 Jan 2025 18:41:27 +0000 (+0900)
Subject: tree-wide: drop merely used _cleanup_ macros, and introduce several new ones (#36071)
X-Git-Tag: v258-rc1~1552
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8fe00520908361f1730d0ec4cbb1574eb7bd0c0;p=thirdparty%2Fsystemd.git

tree-wide: drop merely used _cleanup_ macros, and introduce several new ones (#36071)
---

a8fe00520908361f1730d0ec4cbb1574eb7bd0c0
diff --cc src/core/exec-invoke.c
index b48f5277bc7,da408fbee24..24e700a2892
--- a/src/core/exec-invoke.c
+++ b/src/core/exec-invoke.c
@@@ -1117,10 -1117,10 +1117,10 @@@ static int ask_password_conv
                                  .credential = credential_name,
                                  .tty_fd = -EBADF,
                                  .hup_fd = -EBADF,
 -                                .until = now(CLOCK_MONOTONIC) + 15 * USEC_PER_SEC,
 +                                .until = usec_add(now(CLOCK_MONOTONIC), 15 * USEC_PER_SEC),
                          };
  
-                         _cleanup_(strv_free_erasep) char **acquired = NULL;
+                         _cleanup_strv_free_erase_ char **acquired = NULL;
                          r = ask_password_auto(
                                          &req,
                                          ASK_PASSWORD_ACCEPT_CACHED|