summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@tavianator.com>2023-05-10 15:42:54 -0400
committerTavian Barnes <tavianator@tavianator.com>2023-05-10 15:42:54 -0400
commit8368e139c176dcde3b125f4a180ff868729b1862 (patch)
treec4dd77aef93eef5d67b56aa4dc35ce6c4c371cf2 /src
parentf3ecfc1ee49e1c3ddd3d19ca6166424d72a08a5c (diff)
downloadbfs-8368e139c176dcde3b125f4a180ff868729b1862.tar.xz
config: s/BFS_COUNTOF/countof/
Diffstat (limited to 'src')
-rw-r--r--src/config.h2
-rw-r--r--src/fsade.c2
-rw-r--r--src/opt.c16
3 files changed, 10 insertions, 10 deletions
diff --git a/src/config.h b/src/config.h
index e17f90b..60bc930 100644
--- a/src/config.h
+++ b/src/config.h
@@ -134,7 +134,7 @@
/**
* Get the length of an array.
*/
-#define BFS_COUNTOF(array) (sizeof(array) / sizeof(0[array]))
+#define countof(array) (sizeof(array) / sizeof(0[array]))
// Lower bound on BFS_FLEX_SIZEOF()
#define BFS_FLEX_LB(type, member, length) (offsetof(type, member) + sizeof(((type *)NULL)->member[0]) * (length))
diff --git a/src/fsade.c b/src/fsade.c
index aefbb75..4d67940 100644
--- a/src/fsade.c
+++ b/src/fsade.c
@@ -201,7 +201,7 @@ int bfs_check_acl(const struct BFTW *ftwbuf) {
const char *path = fake_at(ftwbuf);
int ret = -1, error = 0;
- for (size_t i = 0; i < BFS_COUNTOF(acl_types) && ret <= 0; ++i) {
+ for (size_t i = 0; i < countof(acl_types) && ret <= 0; ++i) {
acl_type_t type = acl_types[i];
if (type == ACL_TYPE_DEFAULT && ftwbuf->type != BFS_DIR) {
diff --git a/src/opt.c b/src/opt.c
index 5505b7b..731dd10 100644
--- a/src/opt.c
+++ b/src/opt.c
@@ -1154,21 +1154,21 @@ static const struct {
* Look up the appropriate optimizer for an expression and call it.
*/
static struct bfs_expr *optimize_expr_lookup(struct opt_state *state, struct bfs_expr *expr) {
- for (size_t i = 0; i < BFS_COUNTOF(opt_pure); ++i) {
+ for (size_t i = 0; i < countof(opt_pure); ++i) {
if (opt_pure[i] == expr->eval_fn) {
expr->pure = true;
break;
}
}
- for (size_t i = 0; i < BFS_COUNTOF(opt_always_true); ++i) {
+ for (size_t i = 0; i < countof(opt_always_true); ++i) {
if (opt_always_true[i] == expr->eval_fn) {
expr->always_true = true;
break;
}
}
- for (size_t i = 0; i < BFS_COUNTOF(opt_always_false); ++i) {
+ for (size_t i = 0; i < countof(opt_always_false); ++i) {
if (opt_always_false[i] == expr->eval_fn) {
expr->always_false = true;
break;
@@ -1176,35 +1176,35 @@ static struct bfs_expr *optimize_expr_lookup(struct opt_state *state, struct bfs
}
expr->cost = FAST_COST;
- for (size_t i = 0; i < BFS_COUNTOF(opt_costs); ++i) {
+ for (size_t i = 0; i < countof(opt_costs); ++i) {
if (opt_costs[i].eval_fn == expr->eval_fn) {
expr->cost = opt_costs[i].cost;
break;
}
}
- for (size_t i = 0; i < BFS_COUNTOF(opt_probs); ++i) {
+ for (size_t i = 0; i < countof(opt_probs); ++i) {
if (opt_probs[i].eval_fn == expr->eval_fn) {
expr->probability = opt_probs[i].probability;
break;
}
}
- for (size_t i = 0; i < BFS_COUNTOF(opt_preds); ++i) {
+ for (size_t i = 0; i < countof(opt_preds); ++i) {
if (opt_preds[i].eval_fn == expr->eval_fn) {
infer_pred_facts(state, opt_preds[i].pred);
break;
}
}
- for (size_t i = 0; i < BFS_COUNTOF(opt_ranges); ++i) {
+ for (size_t i = 0; i < countof(opt_ranges); ++i) {
if (opt_ranges[i].eval_fn == expr->eval_fn) {
infer_icmp_facts(state, expr, opt_ranges[i].range);
break;
}
}
- for (size_t i = 0; i < BFS_COUNTOF(opt_fns); ++i) {
+ for (size_t i = 0; i < countof(opt_fns); ++i) {
if (opt_fns[i].eval_fn == expr->eval_fn) {
return opt_fns[i].opt_fn(state, expr);
}