summaryrefslogtreecommitdiffhomepage
path: root/src/nxt_log.h
diff options
context:
space:
mode:
authorAlejandro Colomar <alx.manpages@gmail.com>2022-04-30 19:20:23 +0200
committerAlejandro Colomar <alx.manpages@gmail.com>2022-05-03 12:11:14 +0200
commit952bcc50bfc5bd651a56fd97aa6f1f3c3e214071 (patch)
tree3a144d855ddac17dfa0e033b16b408e19944f5c7 /src/nxt_log.h
parentd929fbe1a4e0365b294e36aed4b5f12ee2a2210e (diff)
downloadunit-952bcc50bfc5bd651a56fd97aa6f1f3c3e214071.tar.gz
unit-952bcc50bfc5bd651a56fd97aa6f1f3c3e214071.tar.bz2
Fixed #define style.
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/ //}'
Diffstat (limited to 'src/nxt_log.h')
-rw-r--r--src/nxt_log.h21
1 files changed, 7 insertions, 14 deletions
diff --git a/src/nxt_log.h b/src/nxt_log.h
index 0cf10b5c..aa2fe673 100644
--- a/src/nxt_log.h
+++ b/src/nxt_log.h
@@ -41,8 +41,7 @@ NXT_EXPORT void nxt_cdecl nxt_log_handler(nxt_uint_t level, nxt_log_t *log,
const char *fmt, ...);
-#define \
-nxt_log_level_enough(log, level) \
+#define nxt_log_level_enough(log, level) \
((log)->level >= (level))
@@ -83,8 +82,7 @@ nxt_log_level_enough(log, level) \
} while (0)
-#define \
-nxt_log_error(_level, _log, ...) \
+#define nxt_log_error(_level, _log, ...) \
do { \
nxt_log_t *_log_ = (_log); \
nxt_uint_t _level_ = (_level); \
@@ -107,8 +105,7 @@ nxt_log_error(_level, _log, ...) \
} while (0)
-#define \
-nxt_log_debug(_log, ...) \
+#define nxt_log_debug(_log, ...) \
do { \
nxt_log_t *_log_ = (_log); \
\
@@ -131,8 +128,7 @@ nxt_log_debug(_log, ...) \
#define nxt_debug(...)
-#define \
-nxt_log_debug(...)
+#define nxt_log_debug(...)
#define nxt_assert(c)
@@ -151,18 +147,15 @@ nxt_log_debug(...)
#endif
-#define \
-nxt_main_log_alert(...) \
+#define nxt_main_log_alert(...) \
nxt_log_alert(&nxt_main_log, __VA_ARGS__)
-#define \
-nxt_main_log_error(level, ...) \
+#define nxt_main_log_error(level, ...) \
nxt_log_error(level, &nxt_main_log, __VA_ARGS__)
-#define \
-nxt_main_log_debug(...) \
+#define nxt_main_log_debug(...) \
nxt_log_debug(&nxt_main_log, __VA_ARGS__)