952bcc50bf
We had a mix of styles for declaring function-like macros:
Style A:
#define \
foo() \
do { \
... \
} while (0)
Style B:
#define foo() \
do { \
... \
} while (0)
We had a similar number of occurences of each style:
$ grep -rnI '^\w*(.*\\' | wc -l
244
$ grep -rn 'define.*(.*)' | wc -l
239
(Those regexes aren't perfect, but a very decent approximation.)
Real examples:
$ find src -type f | xargs sed -n '/^nxt_double_is_zero/,/^$/p'
nxt_double_is_zero(f) \
(fabs(f) <= FLT_EPSILON)
$ find src -type f | xargs sed -n '/define nxt_http_field_set/,/^$/p'
#define nxt_http_field_set(_field, _name, _value) \
do { \
(_field)->name_length = nxt_length(_name); \
(_field)->value_length = nxt_length(_value); \
(_field)->name = (u_char *) _name; \
(_field)->value = (u_char *) _value; \
} while (0)
I'd like to standardize on a single style for them, and IMO,
having the identifier in the same line as #define is a better
option for the following reasons:
- Programmers are used to `#define foo() ...` (readability).
- One less line of code.
- The program for finding them is really simple (see below).
function grep_ngx_func()
{
if (($# != 1)); then
>&2 echo "Usage: ${FUNCNAME[0]} <func>";
return 1;
fi;
find src -type f \
| grep '\.[ch]$' \
| xargs grep -l "$1" \
| sort \
| xargs pcregrep -Mn "(?s)^\$[\w\s*]+?^$1\(.*?^}";
find src -type f \
| grep '\.[ch]$' \
| xargs grep -l "$1" \
| sort \
| xargs pcregrep -Mn "(?s)define $1\(.*?^$" \
| sed -E '1s/^[^:]+:[0-9]+:/&\n\n/';
}
$ grep_ngx_func
Usage: grep_ngx_func <func>
$ grep_ngx_func nxt_http_field_set
src/nxt_http.h:98:
#define nxt_http_field_set(_field, _name, _value) \
do { \
(_field)->name_length = nxt_length(_name); \
(_field)->value_length = nxt_length(_value); \
(_field)->name = (u_char *) _name; \
(_field)->value = (u_char *) _value; \
} while (0)
$ grep_ngx_func nxt_sprintf
src/nxt_sprintf.c:56:
u_char * nxt_cdecl
nxt_sprintf(u_char *buf, u_char *end, const char *fmt, ...)
{
u_char *p;
va_list args;
va_start(args, fmt);
p = nxt_vsprintf(buf, end, fmt, args);
va_end(args);
return p;
}
................
Scripted change:
................
$ find src -type f \
| grep '\.[ch]$' \
| xargs sed -i '/define *\\$/{N;s/ *\\\n/ /;s/ //}'
63 lines
1.5 KiB
C
63 lines
1.5 KiB
C
|
|
/*
|
|
* Copyright (C) Igor Sysoev
|
|
* Copyright (C) NGINX, Inc.
|
|
*/
|
|
|
|
#ifndef _NXT_UNIX_MEM_MAP_H_INCLUDED_
|
|
#define _NXT_UNIX_MEM_MAP_H_INCLUDED_
|
|
|
|
|
|
#define NXT_MEM_MAP_FAILED MAP_FAILED
|
|
|
|
|
|
#define NXT_MEM_MAP_READ PROT_READ
|
|
#define NXT_MEM_MAP_WRITE PROT_WRITE
|
|
|
|
|
|
#if (NXT_HAVE_MAP_ANONYMOUS)
|
|
#define NXT_MEM_MAP_ANON MAP_ANONYMOUS
|
|
#else
|
|
#define NXT_MEM_MAP_ANON MAP_ANON
|
|
#endif
|
|
|
|
#define NXT_MEM_MAP_SHARED (MAP_SHARED | NXT_MEM_MAP_ANON)
|
|
|
|
|
|
#if (NXT_HAVE_MAP_POPULATE)
|
|
/*
|
|
* Linux MAP_POPULATE reads ahead and wires pages.
|
|
* (MAP_POPULATE | MAP_NONBLOCK) wires only resident pages
|
|
* without read ahead but it does not work since Linux 2.6.23.
|
|
*/
|
|
#define NXT_MEM_MAP_PREFAULT MAP_POPULATE
|
|
|
|
#elif (NXT_HAVE_MAP_PREFAULT_READ)
|
|
/* FreeBSD MAP_PREFAULT_READ wires resident pages without read ahead. */
|
|
#define NXT_MEM_MAP_PREFAULT MAP_PREFAULT_READ
|
|
|
|
#else
|
|
#define NXT_MEM_MAP_PREFAULT 0
|
|
#endif
|
|
|
|
#define NXT_MEM_MAP_FILE (MAP_SHARED | NXT_MEM_MAP_PREFAULT)
|
|
|
|
|
|
#define nxt_mem_map_file_ctx_t(ctx)
|
|
|
|
|
|
#define nxt_mem_map(addr, ctx, len, protection, flags, fd, offset) \
|
|
nxt_mem_mmap(addr, len, protection, flags, fd, offset)
|
|
|
|
|
|
#define nxt_mem_unmap(addr, ctx, len) \
|
|
nxt_mem_munmap(addr, len)
|
|
|
|
|
|
NXT_EXPORT void *nxt_mem_mmap(void *addr, size_t len, nxt_uint_t protection,
|
|
nxt_uint_t flags, nxt_fd_t fd, nxt_off_t offset);
|
|
NXT_EXPORT void nxt_mem_munmap(void *addr, size_t len);
|
|
|
|
|
|
#endif /* _NXT_UNIX_MEM_MAP_H_INCLUDED_ */
|