-
Notifications
You must be signed in to change notification settings - Fork 14.5k
[sanitizer_common][NFC] Fix sanitizer_platform_limits_posix.h formatting #147864
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
@llvm/pr-subscribers-compiler-rt-sanitizer Author: Jake Egan (jakeegan) ChangesFrom running Patch is 30.09 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/147864.diff 1 Files Affected:
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
index fdc52aa56c493..a2b6c37d5450c 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -16,37 +16,37 @@
#if SANITIZER_LINUX || SANITIZER_APPLE || SANITIZER_HAIKU
-#include "sanitizer_internal_defs.h"
-#include "sanitizer_platform.h"
-#include "sanitizer_mallinfo.h"
-
-#if SANITIZER_APPLE
-#include <sys/cdefs.h>
-#if !__DARWIN_ONLY_64_BIT_INO_T
-#define SANITIZER_HAS_STAT64 1
-#define SANITIZER_HAS_STATFS64 1
-#else
-#define SANITIZER_HAS_STAT64 0
-#define SANITIZER_HAS_STATFS64 0
-#endif
-#elif SANITIZER_GLIBC || SANITIZER_ANDROID
-#define SANITIZER_HAS_STAT64 1
-#define SANITIZER_HAS_STATFS64 1
-#endif
+# include "sanitizer_internal_defs.h"
+# include "sanitizer_mallinfo.h"
+# include "sanitizer_platform.h"
+
+# if SANITIZER_APPLE
+# include <sys/cdefs.h>
+# if !__DARWIN_ONLY_64_BIT_INO_T
+# define SANITIZER_HAS_STAT64 1
+# define SANITIZER_HAS_STATFS64 1
+# else
+# define SANITIZER_HAS_STAT64 0
+# define SANITIZER_HAS_STATFS64 0
+# endif
+# elif SANITIZER_GLIBC || SANITIZER_ANDROID
+# define SANITIZER_HAS_STAT64 1
+# define SANITIZER_HAS_STATFS64 1
+# endif
-#if defined(__sparc__)
+# if defined(__sparc__)
// FIXME: This can't be included from tsan which does not support sparc yet.
-#include "sanitizer_glibc_version.h"
-#endif
+# include "sanitizer_glibc_version.h"
+# endif
-# define GET_LINK_MAP_BY_DLOPEN_HANDLE(handle) ((link_map*)(handle))
+# define GET_LINK_MAP_BY_DLOPEN_HANDLE(handle) ((link_map *)(handle))
namespace __sanitizer {
extern unsigned struct_utsname_sz;
extern unsigned struct_stat_sz;
-#if SANITIZER_HAS_STAT64
+# if SANITIZER_HAS_STAT64
extern unsigned struct_stat64_sz;
-#endif
+# endif
extern unsigned struct_rusage_sz;
extern unsigned siginfo_t_sz;
extern unsigned struct_itimerval_sz;
@@ -64,13 +64,13 @@ extern unsigned struct_itimerspec_sz;
extern unsigned struct_sigevent_sz;
extern unsigned struct_stack_t_sz;
extern unsigned struct_sched_param_sz;
-#if SANITIZER_HAS_STATFS64
+# if SANITIZER_HAS_STATFS64
extern unsigned struct_statfs64_sz;
-#endif
+# endif
extern unsigned struct_regex_sz;
extern unsigned struct_regmatch_sz;
-#if !SANITIZER_ANDROID
+# if !SANITIZER_ANDROID
extern unsigned struct_fstab_sz;
extern unsigned struct_statfs_sz;
extern unsigned struct_sockaddr_sz;
@@ -82,22 +82,22 @@ unsigned ucontext_t_sz(void *uctx);
# if defined(__x86_64__)
const unsigned struct_kernel_stat_sz = 144;
const unsigned struct_kernel_stat64_sz = 0;
-#elif defined(__i386__)
+# elif defined(__i386__)
const unsigned struct_kernel_stat_sz = 64;
const unsigned struct_kernel_stat64_sz = 96;
-#elif defined(__arm__)
+# elif defined(__arm__)
const unsigned struct_kernel_stat_sz = 64;
const unsigned struct_kernel_stat64_sz = 104;
-#elif defined(__aarch64__)
+# elif defined(__aarch64__)
const unsigned struct_kernel_stat_sz = 128;
const unsigned struct_kernel_stat64_sz = 104;
-#elif defined(__powerpc__) && !defined(__powerpc64__)
+# elif defined(__powerpc__) && !defined(__powerpc64__)
const unsigned struct_kernel_stat_sz = 72;
const unsigned struct_kernel_stat64_sz = 104;
-#elif defined(__powerpc64__)
+# elif defined(__powerpc64__)
const unsigned struct_kernel_stat_sz = 144;
const unsigned struct_kernel_stat64_sz = 104;
-#elif defined(__mips__)
+# elif defined(__mips__)
const unsigned struct_kernel_stat_sz = SANITIZER_ANDROID
? FIRST_32_SECOND_64(104, 128)
# if defined(_ABIN32) && _MIPS_SIM == _ABIN32
@@ -106,21 +106,21 @@ const unsigned struct_kernel_stat_sz = SANITIZER_ANDROID
: FIRST_32_SECOND_64(160, 216);
# endif
const unsigned struct_kernel_stat64_sz = 104;
-#elif defined(__s390__) && !defined(__s390x__)
+# elif defined(__s390__) && !defined(__s390x__)
const unsigned struct_kernel_stat_sz = 64;
const unsigned struct_kernel_stat64_sz = 104;
-#elif defined(__s390x__)
+# elif defined(__s390x__)
const unsigned struct_kernel_stat_sz = 144;
const unsigned struct_kernel_stat64_sz = 0;
-#elif defined(__sparc__) && defined(__arch64__)
+# elif defined(__sparc__) && defined(__arch64__)
const unsigned struct___old_kernel_stat_sz = 0;
const unsigned struct_kernel_stat_sz = 104;
const unsigned struct_kernel_stat64_sz = 144;
-#elif defined(__sparc__) && !defined(__arch64__)
+# elif defined(__sparc__) && !defined(__arch64__)
const unsigned struct___old_kernel_stat_sz = 0;
const unsigned struct_kernel_stat_sz = 64;
const unsigned struct_kernel_stat64_sz = 104;
-#elif SANITIZER_RISCV64
+# elif SANITIZER_RISCV64
const unsigned struct_kernel_stat_sz = 128;
const unsigned struct_kernel_stat64_sz = 0; // RISCV64 does not use stat64
# elif defined(__hexagon__)
@@ -145,15 +145,15 @@ extern unsigned struct_old_utsname_sz;
extern unsigned struct_oldold_utsname_sz;
const unsigned struct_kexec_segment_sz = 4 * sizeof(unsigned long);
-#endif // SANITIZER_LINUX
+# endif // SANITIZER_LINUX
-#if SANITIZER_LINUX
+# if SANITIZER_LINUX
-#if defined(__powerpc64__) || defined(__s390__) || defined(__loongarch__)
+# if defined(__powerpc64__) || defined(__s390__) || defined(__loongarch__)
const unsigned struct___old_kernel_stat_sz = 0;
-#elif !defined(__sparc__)
+# elif !defined(__sparc__)
const unsigned struct___old_kernel_stat_sz = 32;
-#endif
+# endif
extern unsigned struct_rlimit_sz;
extern unsigned struct_utimbuf_sz;
@@ -198,17 +198,17 @@ struct __sanitizer___sysctl_args {
const unsigned old_sigset_t_sz = sizeof(unsigned long);
struct __sanitizer_sem_t {
-#if SANITIZER_ANDROID && defined(_LP64)
+# if SANITIZER_ANDROID && defined(_LP64)
int data[4];
-#elif SANITIZER_ANDROID && !defined(_LP64)
+# elif SANITIZER_ANDROID && !defined(_LP64)
int data;
-#elif SANITIZER_LINUX
+# elif SANITIZER_LINUX
uptr data[4];
-#endif
+# endif
};
-#endif // SANITIZER_LINUX
+# endif // SANITIZER_LINUX
-#if SANITIZER_LINUX && !SANITIZER_ANDROID
+# if SANITIZER_LINUX && !SANITIZER_ANDROID
extern unsigned struct_ustat_sz;
extern unsigned struct_rlimit64_sz;
extern unsigned struct_statvfs64_sz;
@@ -219,45 +219,45 @@ struct __sanitizer_ipc_perm {
int gid;
int cuid;
int cgid;
-#ifdef __powerpc__
+# ifdef __powerpc__
unsigned mode;
unsigned __seq;
u64 __unused1;
u64 __unused2;
-#elif defined(__sparc__)
+# elif defined(__sparc__)
unsigned mode;
unsigned short __pad2;
unsigned short __seq;
unsigned long long __unused1;
unsigned long long __unused2;
-#else
+# else
unsigned int mode;
unsigned short __seq;
unsigned short __pad2;
-#if defined(__x86_64__) && !defined(_LP64)
+# if defined(__x86_64__) && !defined(_LP64)
u64 __unused1;
u64 __unused2;
-#else
+# else
unsigned long __unused1;
unsigned long __unused2;
-#endif
-#endif
+# endif
+# endif
};
struct __sanitizer_shmid_ds {
__sanitizer_ipc_perm shm_perm;
-#if defined(__sparc__)
-#if !defined(__arch64__)
+# if defined(__sparc__)
+# if !defined(__arch64__)
u32 __pad1;
-#endif
+# endif
long shm_atime;
-#if !defined(__arch64__)
+# if !defined(__arch64__)
u32 __pad2;
-#endif
+# endif
long shm_dtime;
-#if !defined(__arch64__)
+# if !defined(__arch64__)
u32 __pad3;
-#endif
+# endif
long shm_ctime;
uptr shm_segsz;
int shm_cpid;
@@ -265,61 +265,61 @@ struct __sanitizer_shmid_ds {
unsigned long shm_nattch;
unsigned long __glibc_reserved1;
unsigned long __glibc_reserved2;
-#else
-#ifndef __powerpc__
+# else
+# ifndef __powerpc__
uptr shm_segsz;
-#elif !defined(__powerpc64__)
+# elif !defined(__powerpc64__)
uptr __unused0;
-#endif
-#if defined(__x86_64__) && !defined(_LP64)
+# endif
+# if defined(__x86_64__) && !defined(_LP64)
u64 shm_atime;
u64 shm_dtime;
u64 shm_ctime;
-#else
+# else
uptr shm_atime;
-#if !defined(_LP64) && !defined(__mips__)
+# if !defined(_LP64) && !defined(__mips__)
uptr __unused1;
-#endif
+# endif
uptr shm_dtime;
-#if !defined(_LP64) && !defined(__mips__)
+# if !defined(_LP64) && !defined(__mips__)
uptr __unused2;
-#endif
+# endif
uptr shm_ctime;
-#if !defined(_LP64) && !defined(__mips__)
+# if !defined(_LP64) && !defined(__mips__)
uptr __unused3;
-#endif
-#endif
-#ifdef __powerpc__
+# endif
+# endif
+# ifdef __powerpc__
uptr shm_segsz;
-#endif
+# endif
int shm_cpid;
int shm_lpid;
-#if defined(__x86_64__) && !defined(_LP64)
+# if defined(__x86_64__) && !defined(_LP64)
u64 shm_nattch;
u64 __unused4;
u64 __unused5;
-#else
+# else
uptr shm_nattch;
uptr __unused4;
uptr __unused5;
-#endif
-#endif
+# endif
+# endif
};
-#endif
+# endif
-#if SANITIZER_LINUX && !SANITIZER_ANDROID
+# if SANITIZER_LINUX && !SANITIZER_ANDROID
extern unsigned struct_msqid_ds_sz;
extern unsigned struct_mq_attr_sz;
extern unsigned struct_timex_sz;
extern unsigned struct_statvfs_sz;
-#endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+# endif // SANITIZER_LINUX && !SANITIZER_ANDROID
struct __sanitizer_iovec {
void *iov_base;
usize iov_len;
};
-#if !SANITIZER_ANDROID
+# if !SANITIZER_ANDROID
struct __sanitizer_ifaddrs {
struct __sanitizer_ifaddrs *ifa_next;
char *ifa_name;
@@ -327,21 +327,21 @@ struct __sanitizer_ifaddrs {
void *ifa_addr; // (struct sockaddr *)
void *ifa_netmask; // (struct sockaddr *)
// This is a union on Linux.
-# ifdef ifa_dstaddr
-# undef ifa_dstaddr
-# endif
+# ifdef ifa_dstaddr
+# undef ifa_dstaddr
+# endif
void *ifa_dstaddr; // (struct sockaddr *)
void *ifa_data;
};
-#endif // !SANITIZER_ANDROID
+# endif // !SANITIZER_ANDROID
-#if SANITIZER_APPLE
+# if SANITIZER_APPLE
typedef unsigned long __sanitizer_pthread_key_t;
-#else
+# else
typedef unsigned __sanitizer_pthread_key_t;
-#endif
+# endif
-#if SANITIZER_LINUX && !SANITIZER_ANDROID
+# if SANITIZER_LINUX && !SANITIZER_ANDROID
struct __sanitizer_XDR {
int x_op;
@@ -355,28 +355,28 @@ struct __sanitizer_XDR {
const int __sanitizer_XDR_ENCODE = 0;
const int __sanitizer_XDR_DECODE = 1;
const int __sanitizer_XDR_FREE = 2;
-#endif
+# endif
struct __sanitizer_passwd {
char *pw_name;
char *pw_passwd;
int pw_uid;
int pw_gid;
-#if SANITIZER_APPLE
+# if SANITIZER_APPLE
long pw_change;
char *pw_class;
-#endif
-#if !(SANITIZER_ANDROID && (SANITIZER_WORDSIZE == 32)) && !SANITIZER_HAIKU
+# endif
+# if !(SANITIZER_ANDROID && (SANITIZER_WORDSIZE == 32)) && !SANITIZER_HAIKU
char *pw_gecos;
-#endif
+# endif
char *pw_dir;
char *pw_shell;
-#if SANITIZER_APPLE
+# if SANITIZER_APPLE
long pw_expire;
-#endif
-#if SANITIZER_HAIKU
+# endif
+# if SANITIZER_HAIKU
char *pw_gecos;
-#endif
+# endif
};
struct __sanitizer_group {
@@ -389,9 +389,9 @@ struct __sanitizer_group {
# if (SANITIZER_LINUX && !SANITIZER_GLIBC && !SANITIZER_ANDROID) || \
(defined(__x86_64__) && !defined(_LP64)) || defined(__hexagon__)
typedef long long __sanitizer_time_t;
-#else
+# else
typedef long __sanitizer_time_t;
-#endif
+# endif
typedef long __sanitizer_suseconds_t;
@@ -436,15 +436,15 @@ struct __sanitizer_tm {
int tm_wday;
int tm_yday;
int tm_isdst;
-#if SANITIZER_HAIKU
+# if SANITIZER_HAIKU
int tm_gmtoff;
-#else
+# else
long int tm_gmtoff;
-#endif
+# endif
const char *tm_zone;
};
-#if SANITIZER_LINUX
+# if SANITIZER_LINUX
struct __sanitizer_mntent {
char *mnt_fsname;
char *mnt_dir;
@@ -459,9 +459,9 @@ struct __sanitizer_file_handle {
int handle_type;
unsigned char f_handle[1]; // variable sized
};
-#endif
+# endif
-#if SANITIZER_APPLE || SANITIZER_HAIKU
+# if SANITIZER_APPLE || SANITIZER_HAIKU
struct __sanitizer_msghdr {
void *msg_name;
unsigned msg_namelen;
@@ -476,7 +476,7 @@ struct __sanitizer_cmsghdr {
int cmsg_level;
int cmsg_type;
};
-#else
+# else
// In POSIX, int msg_iovlen; socklen_t msg_controllen; socklen_t cmsg_len; but
// many implementations don't conform to the standard.
struct __sanitizer_msghdr {
@@ -493,23 +493,23 @@ struct __sanitizer_cmsghdr {
int cmsg_level;
int cmsg_type;
};
-#endif
+# endif
-#if SANITIZER_LINUX
+# if SANITIZER_LINUX
struct __sanitizer_mmsghdr {
__sanitizer_msghdr msg_hdr;
unsigned int msg_len;
};
-#endif
+# endif
-#if SANITIZER_APPLE
+# if SANITIZER_APPLE
struct __sanitizer_dirent {
unsigned long long d_ino;
unsigned long long d_seekoff;
unsigned short d_reclen;
// more fields that we don't care about
};
-#elif SANITIZER_HAIKU
+# elif SANITIZER_HAIKU
struct __sanitizer_dirent {
int d_dev;
int d_pdev;
@@ -543,49 +543,49 @@ struct __sanitizer_dirent64 {
// more fields that we don't care about
};
extern unsigned struct_sock_fprog_sz;
-#endif
+# endif
-#if SANITIZER_HAIKU
+# if SANITIZER_HAIKU
typedef int __sanitizer_clock_t;
-#elif defined(__x86_64__) && !defined(_LP64)
+# elif defined(__x86_64__) && !defined(_LP64)
typedef long long __sanitizer_clock_t;
-#else
+# else
typedef long __sanitizer_clock_t;
-#endif
+# endif
-#if SANITIZER_LINUX || SANITIZER_HAIKU
+# if SANITIZER_LINUX || SANITIZER_HAIKU
typedef int __sanitizer_clockid_t;
typedef unsigned long long __sanitizer_eventfd_t;
-#endif
+# endif
-#if SANITIZER_LINUX
+# if SANITIZER_LINUX
# if defined(_LP64) || defined(__x86_64__) || defined(__powerpc__) || \
defined(__mips__) || defined(__hexagon__)
typedef unsigned __sanitizer___kernel_uid_t;
typedef unsigned __sanitizer___kernel_gid_t;
-#else
+# else
typedef unsigned short __sanitizer___kernel_uid_t;
typedef unsigned short __sanitizer___kernel_gid_t;
-#endif
-#if defined(__x86_64__) && !defined(_LP64)
+# endif
+# if defined(__x86_64__) && !defined(_LP64)
typedef long long __sanitizer___kernel_off_t;
-#else
+# else
typedef long __sanitizer___kernel_off_t;
-#endif
+# endif
-#if defined(__powerpc__) || defined(__mips__)
+# if defined(__powerpc__) || defined(__mips__)
typedef unsigned int __sanitizer___kernel_old_uid_t;
typedef unsigned int __sanitizer___kernel_old_gid_t;
-#else
+# else
typedef unsigned short __sanitizer___kernel_old_uid_t;
typedef unsigned short __sanitizer___kernel_old_gid_t;
-#endif
+# endif
typedef long long __sanitizer___kernel_loff_t;
typedef struct {
unsigned long fds_bits[1024 / (8 * sizeof(long))];
} __sanitizer___kernel_fd_set;
-#endif
+# endif
// This thing depends on the platform. We are only interested in the upper
// limit. Verified with a compiler assert in .cpp.
@@ -594,52 +594,52 @@ union __sanitizer_pthread_attr_t {
void *align;
};
-#if SANITIZER_ANDROID
-# if SANITIZER_MIPS
+# if SANITIZER_ANDROID
+# if SANITIZER_MIPS
typedef unsigned long __sanitizer_sigset_t[16 / sizeof(unsigned long)];
-# else
+# else
typedef unsigned long __sanitizer_sigset_t;
-# endif
-#elif SANITIZER_APPLE
+# endif
+# elif SANITIZER_APPLE
typedef unsigned __sanitizer_sigset_t;
-#elif SANITIZER_HAIKU
+# elif SANITIZER_HAIKU
typedef unsigned long __sanitizer_sigset_t;
-#elif SANITIZER_LINUX
+# elif SANITIZER_LINUX
struct __sanitizer_sigset_t {
// The size is determined by looking at sizeof of real sigset_t on linux.
uptr val[128 / sizeof(uptr)];
};
-#endif
+# endif
struct __sanitizer_siginfo_pad {
-#if SANITIZER_X32
+# if SANITIZER_X32
// x32 siginfo_t is aligned to 8 bytes.
u64 pad[128 / sizeof(u64)];
-#else
+# else
// Require uptr, because siginfo_t is always pointer-size aligned on Linux.
uptr pad[128 / sizeof(uptr)];
-#endif
+# endif
};
-#if SANITIZER_LINUX
-# define SANITIZER_HAS_SIGINFO 1
+# if SANITIZER_LINUX
+# define SANITIZER_HAS_SIGINFO 1
union __sanitizer_siginfo {
__extension__ struct {
int si_signo;
-# if SANITIZER_MIPS
+# if SANITIZER_MIPS
int si_code;
int si_errno;
-# else
+# else
int si_errno;
int si_code;
-# endif
+# endif
};
__sanitizer_siginfo_pad pad;
};
-#else
-# define SANITIZER_HAS_SIGINFO 0
+# else
+# define SANITIZER_HAS_SIGINFO 0
typedef __sanitizer_siginfo_pad __sanitizer_siginfo;
-#endif
+# endif
using __sanitizer_sighandler_ptr = void (*)(int sig);
using __sanitizer_sigactionhandler_ptr = void (*)(int sig,
@@ -647,7 +647,7 @@ using __sanitizer_sigactionhandler_ptr = void (*)(int sig,
void *uctx);
// Linux system headers define the 'sa_handler' and 'sa_sigaction' macros.
-#if SANITIZER_ANDROID && (SANITIZER_WORDSIZE == 64)
+# if SANITIZER_ANDROID && (SANITIZER_WORDSIZE == 64)
struct __sanitizer_sigaction {
unsigned sa_flags;
union {
@@ -657,7 +657,8 @@ struct __sanitizer_sigaction {
__sanitizer_sigset_t sa_mask;
void (*sa_restorer)();
};
-#elif SANITIZER_ANDROID && SANITIZER_MIPS32 // check this before WORDSIZE == 32
+# elif SANITIZER_ANDROID && \
+ SANITIZER_MIPS32 // check this before WORDSIZE == 32
struct __sanitizer_sigaction {
unsigned sa_flags;
union {
@@ -666,7 +667,7 @@ struct __sanitizer_sigaction {
};
__sanitizer_sigset_t sa_mask;
};
-#elif SANITIZER_ANDROID && (SANITIZER_WORDSIZE == 32)
+# elif SANITIZER_ANDROID && (SANITIZER_WORDSIZE == 32)
struct __sanitizer_sigaction {
union {
__sanitizer_sigactionhandler_ptr sigaction;
@@ -676,7 +677,7 @@ struct __sanitizer_sigaction {
uptr sa_flags;
void (*sa_restorer)();
};
-#else // !SANITIZER_ANDROID
+# else // !SANITIZER_ANDROID
struct __sanitizer_sigaction {
# if defined(__mips__) && !SANITIZER_FREEBSD && !SANITIZER_MUSL
unsigned int sa_flags;
@@ -722,20 +723,20 @@ struct __sanitizer_sigaction {
__sanitizer_sigset_t sa_mask;
# endif
};
-#endif // !SANITIZER_ANDROID
+# endif // !SANITIZER_ANDROID
-#if defined(__mips__)
-#define __SANITIZER_KERNEL_NSIG 128
-#else
-#define __SANITIZER_KERNEL_NSIG 64
-#endif
+# if defined(__mips__)
+# define __SANITIZER_KERNEL_NSIG 128
+# else
+# define __SANITIZER_KERNEL_NSIG 64
+# endif
struct __sanitizer_kernel_sigset_t {
uptr sig[__SANITIZER_KERNEL_NSIG / (sizeof(uptr) * 8)];
};
// Linux system headers define the 'sa_handler' and 'sa_sigaction' macros.
-#if SANITIZER_MIPS
+# if SANITIZER_MIPS
struct __sanitizer_kernel_sigaction_t {
unsigned int sa_flags;
union {
@@ -745,7 +746,7 @@ struct __sanitizer_kernel_sigaction_t {
__sanitizer_kernel_sigset_t sa_mask;
void (*sa_restorer)(void);
};
-#else
+# else
struct __sanitizer_kernel_sigaction_t {
union {
void (*handler)(int signo);
@@ -755,22 +756,22 @@ struct __sanitizer_kernel_sigaction_t {
void (*sa_restorer)(void);
__sanitizer_kernel_sigset_t sa_mask;
};
-#endif
+# endif
extern const uptr sig_ign;
extern const uptr sig_dfl;
extern const uptr sig_err;
extern const uptr sa_siginfo;
-#if SANITIZER_LINUX
+# if SANITIZER_LINUX
extern int e_tabsz;
-#endif
+# endif
extern int af_inet;
extern int af_inet6;
uptr __sanitizer_in_addr_sz(int af);
-#if SANITIZER_LINUX
+# if SANITIZER_LINUX
struct __sanitizer_dl_phdr_info {
uptr dlpi_addr;
const char *dlpi_name;
@@ -779,7 +780,7 @@ struct __sanitizer_dl_phdr_info {
};
extern unsigned struct_ElfW_Phdr_sz;
-#endif
+# endif
struct __sanitizer_protoent {
char *p_name;
@@ -799,15 +800,15 @@ struct __sanitizer_addrinfo {
int ai_family;
int ai_socktype;
int ai_protocol;
-#if SANITIZER_ANDROID || SANITIZER_APPLE || SANITIZER_HAIKU
+# if SANITIZER_ANDROID || SANITIZER_APPLE || SANITIZER_HAIKU
unsigned ai_addrlen;
char *ai_canonname;
void *ai_addr;
-#else // LINUX
+# else // LINUX
unsigned ai_addrlen;
void *ai_addr;
char *ai_canonname;
-#endif
+# endif
struct __sanitizer_addrinfo *ai_next;
};
@@ -825,14 +826,14 @@ struct __sanitizer_pollfd {
short revents;
};
-#if SANITIZER_ANDROID || SANITIZER_APPLE
+# if SANITIZER_ANDROID || SANITIZER_APPLE
typedef unsigned __sanitizer_nfds_t;
-#else
+# else
typedef unsigned long __sanitizer_nfds_t;
-#endif
+# endif
-#if !SANITIZER_ANDROID
-# if SANITIZER_LINUX
+# if !SANITIZER_ANDROID
+# if SANITIZER_LINUX
struct __sanitizer_glob_t {
uptr g...
[truncated]
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Whitespace changes (all reasonable) plus one case where header includes were reordered.
From running
clang-format
on the whole file.