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/feature/dirparse | |
| 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/feature/dirparse')
| -rw-r--r-- | src/feature/dirparse/parsecommon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/feature/dirparse/parsecommon.c b/src/feature/dirparse/parsecommon.c index 0c63cd4846..ab465c4d7f 100644 --- a/src/feature/dirparse/parsecommon.c +++ b/src/feature/dirparse/parsecommon.c @@ -222,7 +222,7 @@ token_check_object(memarea_t *area, const char *kwd, kwd, crypto_pk_num_bits(tok->key)); RET_ERR(ebuf); } - /* fall through */ + FALLTHROUGH; case NEED_KEY: /* There must be some kind of key. */ if (!tok->key) { tor_snprintf(ebuf, sizeof(ebuf), "Missing public key for %s", kwd); |