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/proto | |
| 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/proto')
| -rw-r--r-- | src/core/proto/proto_socks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/proto/proto_socks.c b/src/core/proto/proto_socks.c index 2070b233d2..198195c0ae 100644 --- a/src/core/proto/proto_socks.c +++ b/src/core/proto/proto_socks.c @@ -860,7 +860,7 @@ fetch_from_buf_socks(buf_t *buf, socks_request_t *req, case SOCKS_RESULT_TRUNCATED: if (datalen == n_pullup) return 0; - /* FALLTHRU */ + FALLTHROUGH; case SOCKS_RESULT_MORE_EXPECTED: res = 0; break; @@ -966,7 +966,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, strlcpy((char*)req->reply, SOCKS_PROXY_IS_NOT_AN_HTTP_PROXY_MSG, MAX_SOCKS_REPLY_LEN); req->replylen = strlen((char*)req->reply)+1; - /* fall through */ + FALLTHROUGH; default: /* version is not socks4 or socks5 */ log_warn(LD_APP, "Socks version %d not recognized. (This port is not an " |