diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-05-06 16:55:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-05-06 16:55:41 -0400 |
| commit | 4a2347d2902c2688e766e4a83a5db69847b7b578 (patch) | |
| tree | 06b0cd924071039532e53cc5855d6c3bcdf3763e /src/core/or/scheduler.c | |
| parent | 42246f8c9aee97d3efb0b437369554a3fa6f6890 (diff) | |
| parent | c116728209e4ece3249564208e9387f67192a7f6 (diff) | |
| download | tor-4a2347d2902c2688e766e4a83a5db69847b7b578.tar.gz tor-4a2347d2902c2688e766e4a83a5db69847b7b578.zip | |
Merge branch 'maint-0.4.3'
Amazingly, this time we had no merge conflicts with "falls through" comments.
Diffstat (limited to 'src/core/or/scheduler.c')
| -rw-r--r-- | src/core/or/scheduler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/or/scheduler.c b/src/core/or/scheduler.c index 6633ccfe1f..ff58f9ca5b 100644 --- a/src/core/or/scheduler.c +++ b/src/core/or/scheduler.c @@ -191,7 +191,7 @@ get_scheduler_type_string(scheduler_types_t type) case SCHEDULER_KIST_LITE: return "KISTLite"; case SCHEDULER_NONE: - /* fallthrough */ + FALLTHROUGH; default: tor_assert_unreached(); return "(N/A)"; @@ -287,7 +287,7 @@ select_scheduler(void) scheduler_kist_set_lite_mode(); goto end; case SCHEDULER_NONE: - /* fallthrough */ + FALLTHROUGH; default: /* Our option validation should have caught this. */ tor_assert_unreached(); |