]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tree-wide: drop merely used _cleanup_ macros, and introduce several new ones (#36071)
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 20 Jan 2025 18:41:27 +0000 (03:41 +0900)
committerGitHub <noreply@github.com>
Mon, 20 Jan 2025 18:41:27 +0000 (03:41 +0900)
1  2 
src/basic/capability-util.h
src/boot/boot.c
src/boot/random-seed.c
src/boot/util.c
src/core/exec-invoke.c
src/import/importd.c
src/pcrlock/pcrlock.c

Simple merge
diff --cc src/boot/boot.c
Simple merge
Simple merge
diff --cc src/boot/util.c
Simple merge
index b48f5277bc7972d6fb171fb3a008f8057195b680,da408fbee2499f83b23621872464fcd0e5392005..24e700a28927bf97a20e820c215c20ad2ddfdc35
@@@ -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|
Simple merge
Simple merge