diff options
author | Lennart Poettering <lennart@poettering.net> | 2023-02-10 16:55:06 +0100 |
---|---|---|
committer | Luca Boccassi <luca.boccassi@gmail.com> | 2023-02-17 23:45:23 +0000 |
commit | c56e8d8f41453b02f4ed68388eb3e476a12f4140 (patch) | |
tree | 5bd1a93b8fde8cd11033185f062620644f19f5a1 /src/shared/selinux-util.c | |
parent | ebc19b154c12ca58aecca2087ca4fb9eb4095eaa (diff) | |
download | systemd-c56e8d8f41453b02f4ed68388eb3e476a12f4140.tar.gz |
util: move mallinfo compat glue from selinux code into generic code
Diffstat (limited to 'src/shared/selinux-util.c')
-rw-r--r-- | src/shared/selinux-util.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c index a74883ab81..cc00a85952 100644 --- a/src/shared/selinux-util.c +++ b/src/shared/selinux-util.c @@ -2,7 +2,6 @@ #include <errno.h> #include <fcntl.h> -#include <malloc.h> #include <stddef.h> #include <string.h> #include <sys/stat.h> @@ -23,6 +22,7 @@ #include "fd-util.h" #include "log.h" #include "macro.h" +#include "mallinfo-util.h" #include "path-util.h" #include "selinux-util.h" #include "stdio-util.h" @@ -92,26 +92,6 @@ void mac_selinux_retest(void) { } #if HAVE_SELINUX -# if HAVE_MALLINFO2 -# define HAVE_GENERIC_MALLINFO 1 -typedef struct mallinfo2 generic_mallinfo; -static generic_mallinfo generic_mallinfo_get(void) { - return mallinfo2(); -} -# elif HAVE_MALLINFO -# define HAVE_GENERIC_MALLINFO 1 -typedef struct mallinfo generic_mallinfo; -static generic_mallinfo generic_mallinfo_get(void) { - /* glibc has deprecated mallinfo(), let's suppress the deprecation warning if mallinfo2() doesn't - * exist yet. */ -DISABLE_WARNING_DEPRECATED_DECLARATIONS - return mallinfo(); -REENABLE_WARNING -} -# else -# define HAVE_GENERIC_MALLINFO 0 -# endif - static int open_label_db(void) { struct selabel_handle *hnd; usec_t before_timestamp, after_timestamp; |