diff options
author | Nick Mathewson <nickm@torproject.org> | 2020-05-06 10:45:48 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2020-05-06 16:55:25 -0400 |
commit | c116728209e4ece3249564208e9387f67192a7f6 (patch) | |
tree | 709e04b04039446a6e050c0b14934e48e256177c /src/app | |
parent | a1365b91ff43e6e520b9a881f720767418daccf6 (diff) | |
download | tor-c116728209e4ece3249564208e9387f67192a7f6.tar.gz tor-c116728209e4ece3249564208e9387f67192a7f6.zip |
Use __attribute__((fallthrough)) rather than magic GCC comments.
GCC added an implicit-fallthrough warning a while back, where it
would complain if you had a nontrivial "case:" block that didn't end
with break, return, or something like that. Clang recently added
the same thing.
GCC, however, would let you annotate a fall-through as intended by
any of various magic "/* fall through */" comments. Clang, however,
only seems to like "__attribute__((fallthrough))". Fortunately, GCC
accepts that too.
A previous commit in this branch defined a FALLTHROUGH macro to do
the right thing if GNUC is defined; here we replace all of our "fall
through" comments with uses of that macro.
This is an automated commit, made with the following perl one-liner:
#!/usr/bin/perl -i -p
s#/\* *falls? ?thr.*?\*/#FALLTHROUGH;#i;
(In order to avoid conflicts, I'm applying this script separately to
each maint branch. This is the 0.4.3 version.)
Diffstat (limited to 'src/app')
-rw-r--r-- | src/app/config/quiet_level.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/app/config/quiet_level.c b/src/app/config/quiet_level.c index 4e17978228..e04faaef3a 100644 --- a/src/app/config/quiet_level.c +++ b/src/app/config/quiet_level.c @@ -31,7 +31,7 @@ add_default_log_for_quiet_level(quiet_level_t quiet) /* --hush: log at warning or higher. */ add_default_log(LOG_WARN); break; - case QUIET_NONE: /* fall through */ + case QUIET_NONE: FALLTHROUGH; default: add_default_log(LOG_NOTICE); } |