diff options
author | Dmitry V. Levin <ldv@strace.io> | 2021-08-30 20:00:00 +0000 |
---|---|---|
committer | Dmitry V. Levin <ldv@strace.io> | 2021-08-30 20:00:00 +0000 |
commit | e49a3a6ceeba277be3d8ef04e52c0a21cc8e6f60 (patch) | |
tree | 51526f4e8745da48f8e6a9b8f5a1b928f7878f72 | |
parent | 71f940425cb3f17e6086b29f3d745b25f8220df8 (diff) | |
download | strace-e49a3a6ceeba277be3d8ef04e52c0a21cc8e6f60.tar.gz |
Fix preprocessor indentation
Indent the C preprocessor directives to reflect their nesting
using the following script:
$ cppi -l $(git grep -El '^[[:space:]]*#[[:space:]]*(if|ifdef|ifndef|elif|else|endif|define|pragma)[[:space:]]' src tests |grep -v '\.sh$') |while read f; do
cppi < "$f" > "$f".cppi; mv "$f".cppi "$f"
done
-rw-r--r-- | src/xmalloc.h | 2 | ||||
-rw-r--r-- | tests/prctl-sched-core.c | 4 | ||||
-rw-r--r-- | tests/sockopt-timestamp.c | 16 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/xmalloc.h b/src/xmalloc.h index 94d2689b0..ef8f50656 100644 --- a/src/xmalloc.h +++ b/src/xmalloc.h @@ -84,7 +84,7 @@ void *xmemdup(const void *src, size_t size) void *xarraydup(const void *src, size_t nmemb, size_t memb_size) ATTRIBUTE_MALLOC ATTRIBUTE_ALLOC_SIZE((2, 3)); -#define xobjdup(src_) xmemdup(src_, sizeof(*(src_))) +# define xobjdup(src_) xmemdup(src_, sizeof(*(src_))) /** * Analogous to asprintf, die in case of an error. diff --git a/tests/prctl-sched-core.c b/tests/prctl-sched-core.c index 997733417..c48c36484 100644 --- a/tests/prctl-sched-core.c +++ b/tests/prctl-sched-core.c @@ -45,7 +45,7 @@ main(int argc, char *argv[]) for (size_t i = 0; i < num_skip; i++) { rc = prctl_marker(); -# ifdef PIDNS_TRANSLATION +#ifdef PIDNS_TRANSLATION const char *errstr = sprintrc(rc); pidns_print_leader(); printf("prctl(" XLAT_UNKNOWN(0xffffffff, "PR_???") @@ -56,7 +56,7 @@ main(int argc, char *argv[]) } else { printf("%ld (INJECTED)\n", rc); } -# endif +#endif if (rc < 0) continue; diff --git a/tests/sockopt-timestamp.c b/tests/sockopt-timestamp.c index 924873558..9e89eed87 100644 --- a/tests/sockopt-timestamp.c +++ b/tests/sockopt-timestamp.c @@ -48,27 +48,27 @@ k_recvmsg(const unsigned int fd, const void *const ptr, const unsigned int flags return rc; } -#define SC_setsockopt 14 +# define SC_setsockopt 14 static long k_setsockopt(const unsigned int fd, const unsigned int level, const unsigned int optname, const void *const optval, const unsigned int len) { const kernel_ulong_t fill = (kernel_ulong_t) 0xdefaced00000000ULL; -#ifdef __NR_setsockopt +# ifdef __NR_setsockopt const kernel_ulong_t bad = (kernel_ulong_t) 0xbadc0dedbadc0dedULL; -#endif +# endif return syscall( -#ifdef __NR_setsockopt +# ifdef __NR_setsockopt __NR_setsockopt, -#else /* socketcall */ +# else /* socketcall */ __NR_socketcall, SC_setsockopt, -#endif +# endif fill | fd , fill | level, fill | optname, optval, fill | len -#ifdef __NR_setsockopt +# ifdef __NR_setsockopt , bad -#endif +# endif ); } |