summaryrefslogtreecommitdiff
path: root/src/basic/string-util.c
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2017-10-04 23:01:32 +0900
committerSven Eden <yamakuzure@gmx.net>2017-12-08 07:27:34 +0100
commit5b65a773c10cdab7e9f36312dd4f7cabea3d9bf5 (patch)
treeb3af58441e6566e5629b721c07f7606b14d79e54 /src/basic/string-util.c
parent76937fb46f5e25e982ea90243b625cf91a869964 (diff)
tree-wide: use IN_SET macro (#6977)
Diffstat (limited to 'src/basic/string-util.c')
-rw-r--r--src/basic/string-util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/basic/string-util.c b/src/basic/string-util.c
index 9101d1daa..c3d7d208f 100644
--- a/src/basic/string-util.c
+++ b/src/basic/string-util.c
@@ -677,7 +677,7 @@ char *strip_tab_ansi(char **ibuf, size_t *_isz) {
case STATE_BRACKET:
if (i >= *ibuf + isz || /* EOT */
- (!(*i >= '0' && *i <= '9') && *i != ';' && *i != 'm')) {
+ (!(*i >= '0' && *i <= '9') && !IN_SET(*i, ';', 'm'))) {
fputc_unlocked('\x1B', f);
fputc_unlocked('[', f);
state = STATE_OTHER;
@@ -830,7 +830,7 @@ int free_and_strdup(char **p, const char *s) {
return 1;
}
-#if !HAVE_EXPLICIT_BZERO
+#if !HAVE_DECL_EXPLICIT_BZERO
/*
* Pointer to memset is volatile so that compiler must de-reference
* the pointer and can't assume that it points to any function in