From 9c74802117d97bdb55be08a954319e1b8733cb9d Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Fri, 9 Aug 2024 12:39:22 -0400
Subject: prelude: s/fallthru/_fallthrough/ for consistency with other
 attributes

---
 src/bftw.c    |  2 +-
 src/eval.c    |  4 ++--
 src/parse.c   | 18 +++++++++---------
 src/prelude.h |  4 ++--
 src/printf.c  |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/bftw.c b/src/bftw.c
index f9ef2a1..bb155a4 100644
--- a/src/bftw.c
+++ b/src/bftw.c
@@ -1431,7 +1431,7 @@ static bool bftw_must_stat(const struct bftw_state *state, size_t depth, enum bf
 		if (!(bftw_stat_flags(state, depth) & BFS_STAT_NOFOLLOW)) {
 			return true;
 		}
-		fallthru;
+		_fallthrough;
 
 	default:
 #if __linux__
diff --git a/src/eval.c b/src/eval.c
index 2c88669..7c814ed 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -269,10 +269,10 @@ bool eval_time(const struct bfs_expr *expr, struct bfs_eval *state) {
 	switch (expr->time_unit) {
 	case BFS_DAYS:
 		diff /= 60 * 24;
-		fallthru;
+		_fallthrough;
 	case BFS_MINUTES:
 		diff /= 60;
-		fallthru;
+		_fallthrough;
 	case BFS_SECONDS:
 		break;
 	}
diff --git a/src/parse.c b/src/parse.c
index 6a1b34c..7ba9e33 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -1005,16 +1005,16 @@ static struct bfs_expr *parse_time(struct bfs_parser *parser, int field, int arg
 		switch (*tail) {
 		case 'w':
 			time *= 7;
-			fallthru;
+			_fallthrough;
 		case 'd':
 			time *= 24;
-			fallthru;
+			_fallthrough;
 		case 'h':
 			time *= 60;
-			fallthru;
+			_fallthrough;
 		case 'm':
 			time *= 60;
-			fallthru;
+			_fallthrough;
 		case 's':
 			break;
 		default:
@@ -1951,7 +1951,7 @@ static int parse_mode(const struct bfs_parser *parser, const char *mode, struct
 			who = 0;
 			mask = 0777;
 			state = MODE_WHO;
-			fallthru;
+			_fallthrough;
 
 		case MODE_WHO:
 			switch (*i) {
@@ -1978,7 +1978,7 @@ static int parse_mode(const struct bfs_parser *parser, const char *mode, struct
 			case MODE_EQUALS:
 				expr->file_mode &= ~who;
 				expr->dir_mode &= ~who;
-				fallthru;
+				_fallthrough;
 			case MODE_PLUS:
 				expr->file_mode |= file_change;
 				expr->dir_mode |= dir_change;
@@ -1988,7 +1988,7 @@ static int parse_mode(const struct bfs_parser *parser, const char *mode, struct
 				expr->dir_mode &= ~dir_change;
 				break;
 			}
-			fallthru;
+			_fallthrough;
 
 		case MODE_ACTION:
 			if (who == 0) {
@@ -2073,7 +2073,7 @@ static int parse_mode(const struct bfs_parser *parser, const char *mode, struct
 				break;
 			case 'x':
 				file_change |= mask & 0111;
-				fallthru;
+				_fallthrough;
 			case 'X':
 				dir_change |= mask & 0111;
 				break;
@@ -2136,7 +2136,7 @@ static struct bfs_expr *parse_perm(struct bfs_parser *parser, int field, int arg
 			++mode;
 			break;
 		}
-		fallthru;
+		_fallthrough;
 	default:
 		expr->mode_cmp = BFS_MODE_EQUAL;
 		break;
diff --git a/src/prelude.h b/src/prelude.h
index 24de309..abf3564 100644
--- a/src/prelude.h
+++ b/src/prelude.h
@@ -174,9 +174,9 @@ extern const char bfs_ldlibs[];
  * Silence warnings about switch/case fall-throughs.
  */
 #if __has_attribute(fallthrough)
-#  define fallthru __attribute__((fallthrough))
+#  define _fallthrough __attribute__((fallthrough))
 #else
-#  define fallthru ((void)0)
+#  define _fallthrough ((void)0)
 #endif
 
 /**
diff --git a/src/printf.c b/src/printf.c
index d09d1ec..c57f4ca 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -706,7 +706,7 @@ int bfs_printf_parse(const struct bfs_ctx *ctx, struct bfs_expr *expr, const cha
 				case '+':
 				case ' ':
 					must_be_numeric = true;
-					fallthru;
+					_fallthrough;
 				case '-':
 					if (strchr(fmt.str, c)) {
 						bfs_expr_error(ctx, expr);
-- 
cgit v1.2.3