[master] 6f63b8ef0 Flexelinting: Macros named _something are reserved for the compiler
Poul-Henning Kamp
phk at FreeBSD.org
Tue Aug 6 09:15:12 UTC 2019
commit 6f63b8ef054ce89fc17926ecdf6e6d9badffb957
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Tue Aug 6 08:32:50 2019 +0000
Flexelinting: Macros named _something are reserved for the compiler
diff --git a/bin/varnishd/cache/cache_ban.h b/bin/varnishd/cache/cache_ban.h
index cd82aad38..4288f1297 100644
--- a/bin/varnishd/cache/cache_ban.h
+++ b/bin/varnishd/cache/cache_ban.h
@@ -77,7 +77,7 @@
#define BANS_FLAG_NODEDUP (1<<5)
#define BANS_OPER_EQ 0x10
-#define _BANS_OPER_OFF BANS_OPER_EQ
+#define BANS_OPER_OFF_ BANS_OPER_EQ
#define BANS_OPER_NEQ 0x11
#define BANS_OPER_MATCH 0x12
#define BANS_OPER_NMATCH 0x13
@@ -85,14 +85,14 @@
#define BANS_OPER_GTE 0x15
#define BANS_OPER_LT 0x16
#define BANS_OPER_LTE 0x17
-#define _BANS_OPER_LIM (BANS_OPER_LTE + 1)
+#define BANS_OPER_LIM_ (BANS_OPER_LTE + 1)
-#define BAN_OPERIDX(x) ((x) - _BANS_OPER_OFF)
-#define BAN_OPERARRSZ (_BANS_OPER_LIM - _BANS_OPER_OFF)
-#define ASSERT_BAN_OPER(x) assert((x) >= _BANS_OPER_OFF && (x) < _BANS_OPER_LIM)
+#define BAN_OPERIDX(x) ((x) - BANS_OPER_OFF_)
+#define BAN_OPERARRSZ (BANS_OPER_LIM_ - BANS_OPER_OFF_)
+#define ASSERT_BAN_OPER(x) assert((x) >= BANS_OPER_OFF_ && (x) < BANS_OPER_LIM_)
#define BANS_ARG_URL 0x18
-#define _BANS_ARG_OFF BANS_ARG_URL
+#define BANS_ARG_OFF_ BANS_ARG_URL
#define BANS_ARG_REQHTTP 0x19
#define BANS_ARG_OBJHTTP 0x1a
#define BANS_ARG_OBJSTATUS 0x1b
@@ -100,11 +100,11 @@
#define BANS_ARG_OBJAGE 0x1d
#define BANS_ARG_OBJGRACE 0x1e
#define BANS_ARG_OBJKEEP 0x1f
-#define _BANS_ARG_LIM (BANS_ARG_OBJKEEP + 1)
+#define BANS_ARG_LIM (BANS_ARG_OBJKEEP + 1)
-#define BAN_ARGIDX(x) ((x) - _BANS_ARG_OFF)
-#define BAN_ARGARRSZ (_BANS_ARG_LIM - _BANS_ARG_OFF)
-#define ASSERT_BAN_ARG(x) assert((x) >= _BANS_ARG_OFF && (x) < _BANS_ARG_LIM)
+#define BAN_ARGIDX(x) ((x) - BANS_ARG_OFF_)
+#define BAN_ARGARRSZ (BANS_ARG_LIM - BANS_ARG_OFF_)
+#define ASSERT_BAN_ARG(x) assert((x) >= BANS_ARG_OFF_ && (x) < BANS_ARG_LIM)
// has an arg1_spec (BANS_FLAG_HTTP at build time)
#define BANS_HAS_ARG1_SPEC(arg) \
diff --git a/bin/varnishd/cache/cache_ban_build.c b/bin/varnishd/cache/cache_ban_build.c
index 4c08fd639..441f71b93 100644
--- a/bin/varnishd/cache/cache_ban_build.c
+++ b/bin/varnishd/cache/cache_ban_build.c
@@ -206,7 +206,7 @@ ban_parse_oper(const char *p)
for (i = 0; i < BAN_OPERARRSZ; i++) {
if (!strcmp(p, ban_oper[i]))
- return (_BANS_OPER_OFF + i);
+ return (BANS_OPER_OFF_ + i);
}
return (-1);
}
@@ -251,7 +251,7 @@ BAN_AddTest(struct ban_proto *bp,
}
op = ban_parse_oper(a2);
- if (op < _BANS_OPER_OFF ||
+ if (op < BANS_OPER_OFF_ ||
((1U << BAN_OPERIDX(op)) & arg_opervalid[BAN_ARGIDX(pv->tag)]) == 0)
return (ban_error(bp,
"expected conditional (%s) got \"%s\"",
@@ -424,7 +424,7 @@ BAN_Build_Init(void) {
struct vsb *vsb = VSB_new_auto();
int i;
- for (i = _BANS_ARG_OFF; i < _BANS_ARG_LIM; i ++) {
+ for (i = BANS_ARG_OFF_; i < BANS_ARG_LIM; i ++) {
VSB_clear(vsb);
ban_build_arg_operhelp(vsb, i);
AZ(VSB_finish(vsb));
diff --git a/lib/libvmod_directors/vmod_shard.c b/lib/libvmod_directors/vmod_shard.c
index 9de023190..3fd7fc605 100644
--- a/lib/libvmod_directors/vmod_shard.c
+++ b/lib/libvmod_directors/vmod_shard.c
@@ -93,11 +93,11 @@
#define arg_healthy ((uint32_t)1 << 6)
#define arg_param ((uint32_t)1 << 7)
#define arg_resolve ((uint32_t)1 << 8)
-#define _arg_mask ((arg_resolve << 1) - 1)
+#define arg_mask_ ((arg_resolve << 1) - 1)
/* allowed in shard_param.set */
-#define _arg_mask_set (arg_param - 1)
+#define arg_mask_set_ (arg_param - 1)
/* allowed in shard_param */
-#define _arg_mask_param ( _arg_mask_set \
+#define arg_mask_param_ ( arg_mask_set_ \
& ~arg_key \
& ~arg_key_blob )
@@ -143,7 +143,7 @@ static const struct vmod_directors_shard_param shard_param_default = {
.defaults = NULL,
.scope = SCOPE_VMOD,
- .mask = _arg_mask_param,
+ .mask = arg_mask_param_,
.by = BY_HASH,
.healthy = CHOSEN,
.rampup = 1,
@@ -429,13 +429,13 @@ shard_param_merge(struct vmod_directors_shard_param *to,
const struct vmod_directors_shard_param *from)
{
CHECK_OBJ_NOTNULL(to, VMOD_SHARD_SHARD_PARAM_MAGIC);
- assert((to->mask & ~_arg_mask_param) == 0);
+ assert((to->mask & ~arg_mask_param_) == 0);
- if (to->mask == _arg_mask_param)
+ if (to->mask == arg_mask_param_)
return;
CHECK_OBJ_NOTNULL(from, VMOD_SHARD_SHARD_PARAM_MAGIC);
- assert((from->mask & ~_arg_mask_param) == 0);
+ assert((from->mask & ~arg_mask_param_) == 0);
if ((to->mask & arg_by) == 0 && (from->mask & arg_by) != 0) {
to->by = from->by;
@@ -457,7 +457,7 @@ shard_param_merge(struct vmod_directors_shard_param *to,
to->mask |= from->mask;
- if (to->mask == _arg_mask_param)
+ if (to->mask == arg_mask_param_)
return;
AN(from->defaults);
@@ -495,7 +495,7 @@ shard_blob_key(VCL_BLOB key_blob)
#define tobit(args, name) ((args)->valid_##name ? arg_##name : 0)
static uint32_t
-shard_backend_arg_mask(const struct VARGS(shard_backend) * const a)
+shard_backendarg_mask_(const struct VARGS(shard_backend) * const a)
{
return (tobit(a, by) |
tobit(a, key) |
@@ -535,7 +535,7 @@ shard_param_args(VRT_CTX,
CHECK_OBJ_NOTNULL(p, VMOD_SHARD_SHARD_PARAM_MAGIC);
AN(p->vcl_name);
- assert((args & ~_arg_mask_set) == 0);
+ assert((args & ~arg_mask_set_) == 0);
by = (args & arg_by) ? parse_by_e(by_s) : BY_HASH;
healthy = (args & arg_healthy) ? parse_healthy_e(healthy_s) : CHOSEN;
@@ -631,7 +631,7 @@ shard_param_args(VRT_CTX,
if (args & arg_healthy)
p->healthy = healthy;
- p->mask = args & _arg_mask_param;
+ p->mask = args & arg_mask_param_;
return (p);
}
@@ -643,11 +643,11 @@ vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard,
struct vmod_directors_shard_param *pp = NULL;
const struct vmod_directors_shard_param *ppt;
enum resolve_e resolve;
- uint32_t args = shard_backend_arg_mask(a);
+ uint32_t args = shard_backendarg_mask_(a);
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
CHECK_OBJ_NOTNULL(vshard, VMOD_SHARD_SHARD_MAGIC);
- assert((args & ~_arg_mask) == 0);
+ assert((args & ~arg_mask_) == 0);
if (args & arg_resolve)
resolve = parse_resolve_e(a->resolve);
@@ -703,7 +703,7 @@ vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard,
}
pp = shard_param_args(ctx, pp, "shard.backend()",
- args & _arg_mask_set,
+ args & arg_mask_set_,
a->by, a->key, a->key_blob, a->alt, a->warmup,
a->rampup, a->healthy);
if (pp == NULL)
@@ -987,7 +987,7 @@ vmod_shard_param_set(VRT_CTX, struct vmod_directors_shard_param *p,
{
uint32_t args = shard_param_set_mask(a);
- assert((args & ~_arg_mask_set) == 0);
+ assert((args & ~arg_mask_set_) == 0);
p = shard_param_prep(ctx, p, "shard_param.set()");
if (p == NULL)
More information about the varnish-commit
mailing list