From bfd0ddb66c3640d70399ebce253f2a80285c29ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 11 May 2018 11:09:37 +0200 Subject: [PATCH] Use STRLEN in two places --- src/basic/fs-util.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c index 24c447036..5fb8b88fd 100644 --- a/src/basic/fs-util.c +++ b/src/basic/fs-util.c @@ -251,7 +251,7 @@ int fchmod_umask(int fd, mode_t m) { } int fchmod_opath(int fd, mode_t m) { - char procfs_path[strlen("/proc/self/fd/") + DECIMAL_STR_MAX(int)]; + char procfs_path[STRLEN("/proc/self/fd/") + DECIMAL_STR_MAX(int)]; /* This function operates also on fd that might have been opened with * O_PATH. Indeed fchmodat() doesn't have the AT_EMPTY_PATH flag like @@ -1081,15 +1081,6 @@ int access_fd(int fd, int mode) { return r; } -void unlink_tempfilep(char (*p)[]) { - /* If the file is created with mkstemp(), it will (almost always) - * change the suffix. Treat this as a sign that the file was - * successfully created. We ignore both the rare case where the - * original suffix is used and unlink failures. */ - if (!endswith(*p, ".XXXXXX")) - (void) unlink(*p); -} - int unlinkat_deallocate(int fd, const char *name, int flags) { _cleanup_close_ int truncate_fd = -1; struct stat st; -- 2.30.2