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/ //}'
59 lines
1.5 KiB
C
59 lines
1.5 KiB
C
|
|
/*
|
|
* Copyright (C) Igor Sysoev
|
|
* Copyright (C) NGINX, Inc.
|
|
*/
|
|
|
|
#ifndef _NXT_ARRAY_H_INCLUDED_
|
|
#define _NXT_ARRAY_H_INCLUDED_
|
|
|
|
|
|
typedef struct {
|
|
void *elts;
|
|
/* nelts has uint32_t type because it is used most often. */
|
|
uint32_t nelts;
|
|
uint16_t size;
|
|
uint16_t nalloc;
|
|
nxt_mp_t *mem_pool;
|
|
} nxt_array_t;
|
|
|
|
|
|
nxt_inline void
|
|
nxt_array_init(nxt_array_t *array, nxt_mp_t *mp, size_t size)
|
|
{
|
|
array->elts = nxt_pointer_to(array, sizeof(nxt_array_t));
|
|
array->size = size;
|
|
array->mem_pool = mp;
|
|
}
|
|
|
|
NXT_EXPORT nxt_array_t *nxt_array_create(nxt_mp_t *mp, nxt_uint_t n,
|
|
size_t size);
|
|
NXT_EXPORT void nxt_array_destroy(nxt_array_t *array);
|
|
NXT_EXPORT void *nxt_array_add(nxt_array_t *array);
|
|
NXT_EXPORT void *nxt_array_zero_add(nxt_array_t *array);
|
|
NXT_EXPORT void nxt_array_remove(nxt_array_t *array, void *elt);
|
|
NXT_EXPORT nxt_array_t *nxt_array_copy(nxt_mp_t *mp, nxt_array_t *dst,
|
|
nxt_array_t *src);
|
|
|
|
#define nxt_array_last(array) \
|
|
nxt_pointer_to((array)->elts, (array)->size * ((array)->nelts - 1))
|
|
|
|
|
|
#define nxt_array_reset(array) \
|
|
(array)->nelts = 0;
|
|
|
|
|
|
#define nxt_array_is_empty(array) \
|
|
((array)->nelts == 0)
|
|
|
|
|
|
nxt_inline void *
|
|
nxt_array_remove_last(nxt_array_t *array)
|
|
{
|
|
array->nelts--;
|
|
return nxt_pointer_to(array->elts, array->size * array->nelts);
|
|
}
|
|
|
|
|
|
#endif /* _NXT_ARRAY_H_INCLUDED_ */
|