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;

diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c
index 729e7a447873d15bfcfe1d91a0379e5d3e7607bb..efa0c19fa6b91a89c7075d7da24ac62ef75f8416 100644 (file)
--- a/src/app/config/confparse.c
+++ b/src/app/config/confparse.c
@@ -179,7 +179,7 @@ config_assign_value(const config_format_t *fmt, void *options,
       *(int *)lvalue = CFG_AUTO_PORT;
       break;
     }
-    /* fall through */
+    FALLTHROUGH;
   case CONFIG_TYPE_INT:
   case CONFIG_TYPE_UINT:
     i = (int)tor_parse_long(c->value, 10,
@@ -577,7 +577,7 @@ config_get_assigned_option(const config_format_t *fmt, const void *options,
         escape_val = 0;
         break;
       }
-      /* fall through */
+      FALLTHROUGH;
     case CONFIG_TYPE_CSV_INTERVAL:
     case CONFIG_TYPE_INTERVAL:
     case CONFIG_TYPE_MSEC_INTERVAL:
@@ -588,7 +588,7 @@ config_get_assigned_option(const config_format_t *fmt, const void *options,
       tor_asprintf(&result->value, "%d", *(int*)value);
       escape_val = 0; /* Can't need escape. */
       break;
-    case CONFIG_TYPE_UINT64: /* Fall through */
+    case CONFIG_TYPE_UINT64: FALLTHROUGH;
     case CONFIG_TYPE_MEMUNIT:
       tor_asprintf(&result->value, "%"PRIu64,
                    (*(uint64_t*)value));
@@ -605,7 +605,7 @@ config_get_assigned_option(const config_format_t *fmt, const void *options,
         escape_val = 0;
         break;
       }
-      /* fall through */
+      FALLTHROUGH;
     case CONFIG_TYPE_BOOL:
       result->value = tor_strdup(*(int*)value ? "1" : "0");
       escape_val = 0; /* Can't need escape. */

diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c
index 4db283d20eeb118fa6a79018abc104fbbd8e83d1..f874e39946490716cfe21f99b6ca2f96e7ab9062 100644 (file)
--- a/src/core/or/channeltls.c
+++ b/src/core/or/channeltls.c
@@ -1238,7 +1238,7 @@ channel_tls_handle_var_cell(var_cell_t *var_cell, or_connection_t *conn)
       /* But that should be happening any longer've disabled bufferevents. */
       tor_assert_nonfatal_unreached_once();
 
-      /* fall through */
+      FALLTHROUGH;
     case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING:
       if (!(command_allowed_before_handshake(var_cell->command))) {
         log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,

diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c
index 21369fb5386e8dfb94e2a066c0a08c3f485d7da0..f3a5791d6c43a3afb3c5c058e1b5bcb8bfd29e74 100644 (file)
--- a/src/core/or/circuitbuild.c
+++ b/src/core/or/circuitbuild.c
@@ -2106,7 +2106,7 @@ choose_good_exit_server(origin_circuit_t *circ,
       /* For these three, we want to pick the exit like a middle hop,
        * since it should be random. */
       tor_assert_nonfatal(is_internal);
-      /* Falls through */
+      FALLTHROUGH;
     case CIRCUIT_PURPOSE_C_GENERAL:
       if (is_internal) /* pick it like a middle hop */
         return router_choose_random_node(NULL, options->ExcludeNodes, flags);

diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c
index 145004c71d4707be076f9945e63297a4abb7e51a..be5ac3b7f68ef9811a982a6a69d5ce721309149e 100644 (file)
--- a/src/core/or/circuitlist.c
+++ b/src/core/or/circuitlist.c
@@ -787,7 +787,7 @@ circuit_purpose_to_controller_hs_state_string(uint8_t purpose)
              "Unrecognized circuit purpose: %d",
              (int)purpose);
       tor_fragile_assert();
-      /* fall through */
+      FALLTHROUGH;
 
     case CIRCUIT_PURPOSE_OR:
     case CIRCUIT_PURPOSE_C_GENERAL:
@@ -2738,7 +2738,7 @@ assert_cpath_layer_ok(const crypt_path_t *cp)
     {
     case CPATH_STATE_OPEN:
       relay_crypto_assert_ok(&cp->crypto);
-      /* fall through */
+      FALLTHROUGH;
     case CPATH_STATE_CLOSED:
       /*XXXX Assert that there's no handshake_state either. */
       tor_assert(!cp->rend_dh_handshake_state);

diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c
index 000a7c36dabe36ae1996cea3c8e7f342bf265bba..7273be3510fb8cbb13b2bc4900e7be3277160823 100644 (file)
--- a/src/core/or/circuituse.c
+++ b/src/core/or/circuituse.c
@@ -780,7 +780,7 @@ circuit_expire_building(void)
             TO_ORIGIN_CIRCUIT(victim)->build_state->pending_final_cpath ==
             NULL)
           break;
-        /* fallthrough! */
+        FALLTHROUGH;
       case CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT:
       case CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED:
         /* If we have reached this line, we want to spare the circ for now. */

diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c
index 90991107dc5b1ddab5596132ace82d520308c91b..67a772be08c5fbd1e09ad2e63ea383b5b883c247 100644 (file)
--- a/src/core/or/connection_edge.c
+++ b/src/core/or/connection_edge.c
@@ -324,7 +324,7 @@ connection_edge_process_inbuf(edge_connection_t *conn, int package_partial)
       }
       /* Fall through if the connection is on a circuit without optimistic
        * data support. */
-      /* Falls through. */
+      FALLTHROUGH;
     case EXIT_CONN_STATE_CONNECTING:
     case AP_CONN_STATE_RENDDESC_WAIT:
     case AP_CONN_STATE_CIRCUIT_WAIT:

diff --git a/src/core/or/onion.c b/src/core/or/onion.c
index aa77465b967e12e5124c64eb49988bf32d4d13b1..aeddedd80749e06a92083b2d07c122a40f7b545f 100644 (file)
--- a/src/core/or/onion.c
+++ b/src/core/or/onion.c
@@ -509,7 +509,7 @@ create_cell_format_impl(cell_t *cell_out, const create_cell_t *cell_in,
       p += 16;
       space -= 16;
     }
-    /* Fall through */
+    FALLTHROUGH;
   case CELL_CREATE_FAST:
     tor_assert(cell_in->handshake_len <= space);
     memcpy(p, cell_in->onionskin, cell_in->handshake_len);

diff --git a/src/core/or/reasons.c b/src/core/or/reasons.c
index a7952279ba01dc3bf01a26860aeed0497b872641..e21bfa670afe55b58520514c9f638a037b272709 100644 (file)
--- a/src/core/or/reasons.c
+++ b/src/core/or/reasons.c
@@ -489,7 +489,7 @@ end_reason_to_http_connect_response_line(int endreason)
       return "HTTP/1.0 502 Bad Gateway (tor protocol violation)\r\n\r\n";
     case END_STREAM_REASON_ENTRYPOLICY:
       return "HTTP/1.0 403 Forbidden (entry policy violation)\r\n\r\n";
-    case END_STREAM_REASON_NOTDIRECTORY: /* Fall Through */
+    case END_STREAM_REASON_NOTDIRECTORY: FALLTHROUGH;
     default:
       tor_assert_nonfatal_unreached();
       return "HTTP/1.0 500 Internal Server Error (weird end reason)\r\n\r\n";

diff --git a/src/core/or/relay.c b/src/core/or/relay.c
index dc88a6f6493b52768fb0880c5089c85fbbd37906..f5fc1cfbb3967f2f44a7e9fb62a2e029be05ef23 100644 (file)
--- a/src/core/or/relay.c
+++ b/src/core/or/relay.c
@@ -866,7 +866,7 @@ connection_ap_process_end_not_open(
           break; /* break means it'll close, below */
         /* Else fall through: expire this circuit, clear the
          * chosen_exit_name field, and try again. */
-        /* Falls through. */
+        FALLTHROUGH;
       case END_STREAM_REASON_RESOLVEFAILED:
       case END_STREAM_REASON_TIMEOUT:
       case END_STREAM_REASON_MISC:

diff --git a/src/core/or/scheduler.c b/src/core/or/scheduler.c
index f85201b7d5d3d0a3e741608feaac6ec589a4b241..9f1a27d501573f1e8e9d9c48fd4e4791f8c87715 100644 (file)
--- a/src/core/or/scheduler.c
+++ b/src/core/or/scheduler.c
@@ -192,7 +192,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)";
@@ -288,7 +288,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();

diff --git a/src/core/proto/proto_socks.c b/src/core/proto/proto_socks.c
index a6493366e67b9a4b9515d6ef422466bda9bede6f..c7bf13b9f4ef7f7352f86a5e149e955eb50147d9 100644 (file)
--- a/src/core/proto/proto_socks.c
+++ b/src/core/proto/proto_socks.c
@@ -856,7 +856,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;
@@ -962,7 +962,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 "

diff --git a/src/ext/csiphash.c b/src/ext/csiphash.c
index a6a9846db48e9a3199dcc053f1d9477fc77af75e..a65b6fcbe62d9a287fbe0662b554a72991de9a4b 100644 (file)
--- a/src/ext/csiphash.c
+++ b/src/ext/csiphash.c
@@ -88,13 +88,13 @@ uint64_t siphash24(const void *src, unsigned long src_sz, const struct sipkey *k
        }
 
        switch (src_sz - blocks) {
-               case 7: last7 |= (uint64_t)m[i + 6] << 48; /* Falls through. */
-               case 6: last7 |= (uint64_t)m[i + 5] << 40; /* Falls through. */
-               case 5: last7 |= (uint64_t)m[i + 4] << 32; /* Falls through. */
-               case 4: last7 |= (uint64_t)m[i + 3] << 24; /* Falls through. */
-               case 3: last7 |= (uint64_t)m[i + 2] << 16; /* Falls through. */
-               case 2: last7 |= (uint64_t)m[i + 1] <<  8; /* Falls through. */
-               case 1: last7 |= (uint64_t)m[i + 0]      ; /* Falls through. */
+               case 7: last7 |= (uint64_t)m[i + 6] << 48; FALLTHROUGH;
+               case 6: last7 |= (uint64_t)m[i + 5] << 40; FALLTHROUGH;
+               case 5: last7 |= (uint64_t)m[i + 4] << 32; FALLTHROUGH;
+               case 4: last7 |= (uint64_t)m[i + 3] << 24; FALLTHROUGH;
+               case 3: last7 |= (uint64_t)m[i + 2] << 16; FALLTHROUGH;
+               case 2: last7 |= (uint64_t)m[i + 1] <<  8; FALLTHROUGH;
+               case 1: last7 |= (uint64_t)m[i + 0]      ; FALLTHROUGH;
                case 0:
                default:;
        }

diff --git a/src/ext/ed25519/donna/modm-donna-32bit.h b/src/ext/ed25519/donna/modm-donna-32bit.h
index 0ef9e58fa16abe2d92f09fb48b307fe8b152823f..5934d9ca9d2a329d531f344bbe56cb2258ac3e5b 100644 (file)
--- a/src/ext/ed25519/donna/modm-donna-32bit.h
+++ b/src/ext/ed25519/donna/modm-donna-32bit.h
@@ -385,14 +385,14 @@ sub256_modm_batch(bignum256modm out, const bignum256modm a, const bignum256modm
        size_t i = 0;
        bignum256modm_element_t carry = 0;
        switch (limbsize) {
-               case 8: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; /* Falls through. */
-               case 7: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; /* Falls through. */
-               case 6: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; /* Falls through. */
-               case 5: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; /* Falls through. */
-               case 4: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; /* Falls through. */
-               case 3: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; /* Falls through. */
-               case 2: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; /* Falls through. */
-               case 1: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; /* Falls through. */
+               case 8: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; FALLTHROUGH;
+               case 7: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; FALLTHROUGH;
+               case 6: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; FALLTHROUGH;
+               case 5: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; FALLTHROUGH;
+               case 4: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; FALLTHROUGH;
+               case 3: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; FALLTHROUGH;
+               case 2: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; FALLTHROUGH;
+               case 1: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 31); out[i] &= 0x3fffffff; i++; FALLTHROUGH;
                case 0: 
                default: out[i] = (a[i] - b[i]) - carry;
        }
@@ -403,14 +403,14 @@ sub256_modm_batch(bignum256modm out, const bignum256modm a, const bignum256modm
 static int
 lt256_modm_batch(const bignum256modm a, const bignum256modm b, size_t limbsize) {
        switch (limbsize) {
-               case 8: if (a[8] > b[8]) return 0; if (a[8] < b[8]) return 1; /* Falls through. */
-               case 7: if (a[7] > b[7]) return 0; if (a[7] < b[7]) return 1; /* Falls through. */
-               case 6: if (a[6] > b[6]) return 0; if (a[6] < b[6]) return 1; /* Falls through. */
-               case 5: if (a[5] > b[5]) return 0; if (a[5] < b[5]) return 1; /* Falls through. */
-               case 4: if (a[4] > b[4]) return 0; if (a[4] < b[4]) return 1; /* Falls through. */
-               case 3: if (a[3] > b[3]) return 0; if (a[3] < b[3]) return 1; /* Falls through. */
-               case 2: if (a[2] > b[2]) return 0; if (a[2] < b[2]) return 1; /* Falls through. */
-               case 1: if (a[1] > b[1]) return 0; if (a[1] < b[1]) return 1; /* Falls through. */
+               case 8: if (a[8] > b[8]) return 0; if (a[8] < b[8]) return 1; FALLTHROUGH;
+               case 7: if (a[7] > b[7]) return 0; if (a[7] < b[7]) return 1; FALLTHROUGH;
+               case 6: if (a[6] > b[6]) return 0; if (a[6] < b[6]) return 1; FALLTHROUGH;
+               case 5: if (a[5] > b[5]) return 0; if (a[5] < b[5]) return 1; FALLTHROUGH;
+               case 4: if (a[4] > b[4]) return 0; if (a[4] < b[4]) return 1; FALLTHROUGH;
+               case 3: if (a[3] > b[3]) return 0; if (a[3] < b[3]) return 1; FALLTHROUGH;
+               case 2: if (a[2] > b[2]) return 0; if (a[2] < b[2]) return 1; FALLTHROUGH;
+               case 1: if (a[1] > b[1]) return 0; if (a[1] < b[1]) return 1; FALLTHROUGH;
                case 0: if (a[0] > b[0]) return 0; if (a[0] < b[0]) return 1;
        }
        return 0;
@@ -420,14 +420,14 @@ lt256_modm_batch(const bignum256modm a, const bignum256modm b, size_t limbsize)
 static int
 lte256_modm_batch(const bignum256modm a, const bignum256modm b, size_t limbsize) {
        switch (limbsize) {
-               case 8: if (a[8] > b[8]) return 0; if (a[8] < b[8]) return 1; /* Falls through. */
-               case 7: if (a[7] > b[7]) return 0; if (a[7] < b[7]) return 1; /* Falls through. */
-               case 6: if (a[6] > b[6]) return 0; if (a[6] < b[6]) return 1; /* Falls through. */
-               case 5: if (a[5] > b[5]) return 0; if (a[5] < b[5]) return 1; /* Falls through. */
-               case 4: if (a[4] > b[4]) return 0; if (a[4] < b[4]) return 1; /* Falls through. */
-               case 3: if (a[3] > b[3]) return 0; if (a[3] < b[3]) return 1; /* Falls through. */
-               case 2: if (a[2] > b[2]) return 0; if (a[2] < b[2]) return 1; /* Falls through. */
-               case 1: if (a[1] > b[1]) return 0; if (a[1] < b[1]) return 1; /* Falls through. */
+               case 8: if (a[8] > b[8]) return 0; if (a[8] < b[8]) return 1; FALLTHROUGH;
+               case 7: if (a[7] > b[7]) return 0; if (a[7] < b[7]) return 1; FALLTHROUGH;
+               case 6: if (a[6] > b[6]) return 0; if (a[6] < b[6]) return 1; FALLTHROUGH;
+               case 5: if (a[5] > b[5]) return 0; if (a[5] < b[5]) return 1; FALLTHROUGH;
+               case 4: if (a[4] > b[4]) return 0; if (a[4] < b[4]) return 1; FALLTHROUGH;
+               case 3: if (a[3] > b[3]) return 0; if (a[3] < b[3]) return 1; FALLTHROUGH;
+               case 2: if (a[2] > b[2]) return 0; if (a[2] < b[2]) return 1; FALLTHROUGH;
+               case 1: if (a[1] > b[1]) return 0; if (a[1] < b[1]) return 1; FALLTHROUGH;
                case 0: if (a[0] > b[0]) return 0; if (a[0] < b[0]) return 1;
        }
        return 1;

diff --git a/src/ext/ed25519/donna/modm-donna-64bit.h b/src/ext/ed25519/donna/modm-donna-64bit.h
index 06c98e30395142a8cd6708f740d5241d8dba40d6..aa361afdbc6f9611030dfa754b826ca71bed53d1 100644 (file)
--- a/src/ext/ed25519/donna/modm-donna-64bit.h
+++ b/src/ext/ed25519/donna/modm-donna-64bit.h
@@ -294,10 +294,10 @@ sub256_modm_batch(bignum256modm out, const bignum256modm a, const bignum256modm
        size_t i = 0;
        bignum256modm_element_t carry = 0;
        switch (limbsize) {
-               case 4: out[i] = (a[i] - b[i])        ; carry = (out[i] >> 63); out[i] &= 0xffffffffffffff; i++; /* Falls through. */
-               case 3: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 63); out[i] &= 0xffffffffffffff; i++; /* Falls through. */
-               case 2: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 63); out[i] &= 0xffffffffffffff; i++; /* Falls through. */
-               case 1: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 63); out[i] &= 0xffffffffffffff; i++; /* Falls through. */
+               case 4: out[i] = (a[i] - b[i])        ; carry = (out[i] >> 63); out[i] &= 0xffffffffffffff; i++; FALLTHROUGH;
+               case 3: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 63); out[i] &= 0xffffffffffffff; i++; FALLTHROUGH;
+               case 2: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 63); out[i] &= 0xffffffffffffff; i++; FALLTHROUGH;
+               case 1: out[i] = (a[i] - b[i]) - carry; carry = (out[i] >> 63); out[i] &= 0xffffffffffffff; i++; FALLTHROUGH;
                case 0: 
                default: out[i] = (a[i] - b[i]) - carry;
        }
@@ -310,10 +310,10 @@ lt256_modm_batch(const bignum256modm a, const bignum256modm b, size_t limbsize)
        size_t i = 0;
        bignum256modm_element_t t, carry = 0;
        switch (limbsize) {
-               case 4: t = (a[i] - b[i])        ; carry = (t >> 63); i++; /* Falls through. */
-               case 3: t = (a[i] - b[i]) - carry; carry = (t >> 63); i++; /* Falls through. */
-               case 2: t = (a[i] - b[i]) - carry; carry = (t >> 63); i++; /* Falls through. */
-               case 1: t = (a[i] - b[i]) - carry; carry = (t >> 63); i++; /* Falls through. */
+               case 4: t = (a[i] - b[i])        ; carry = (t >> 63); i++; FALLTHROUGH;
+               case 3: t = (a[i] - b[i]) - carry; carry = (t >> 63); i++; FALLTHROUGH;
+               case 2: t = (a[i] - b[i]) - carry; carry = (t >> 63); i++; FALLTHROUGH;
+               case 1: t = (a[i] - b[i]) - carry; carry = (t >> 63); i++; FALLTHROUGH;
                case 0: t = (a[i] - b[i]) - carry; carry = (t >> 63);
        }
        return (int)carry;
@@ -325,10 +325,10 @@ lte256_modm_batch(const bignum256modm a, const bignum256modm b, size_t limbsize)
        size_t i = 0;
        bignum256modm_element_t t, carry = 0;
        switch (limbsize) {
-               case 4: t = (b[i] - a[i])        ; carry = (t >> 63); i++; /* Falls through. */
-               case 3: t = (b[i] - a[i]) - carry; carry = (t >> 63); i++; /* Falls through. */
-               case 2: t = (b[i] - a[i]) - carry; carry = (t >> 63); i++; /* Falls through. */
-               case 1: t = (b[i] - a[i]) - carry; carry = (t >> 63); i++; /* Falls through. */
+               case 4: t = (b[i] - a[i])        ; carry = (t >> 63); i++; FALLTHROUGH;
+               case 3: t = (b[i] - a[i]) - carry; carry = (t >> 63); i++; FALLTHROUGH;
+               case 2: t = (b[i] - a[i]) - carry; carry = (t >> 63); i++; FALLTHROUGH;
+               case 1: t = (b[i] - a[i]) - carry; carry = (t >> 63); i++; FALLTHROUGH;
                case 0: t = (b[i] - a[i]) - carry; carry = (t >> 63);
        }
        return (int)!carry;

diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c
index 1bfb62538e32ac1f6bf517142c845cc6b841b68e..7c2159ce848b7f1e108886f3f5fd7776b9d973d7 100644 (file)
--- a/src/feature/client/entrynodes.c
+++ b/src/feature/client/entrynodes.c
@@ -2263,7 +2263,7 @@ entry_guards_note_guard_success(guard_selection_t *gs,
       break;
     default:
       tor_assert_nonfatal_unreached();
-      /* Fall through. */
+      FALLTHROUGH;
     case GUARD_CIRC_STATE_USABLE_IF_NO_BETTER_GUARD:
       if (guard->is_primary) {
         /* XXXX #20832 -- I don't actually like this logic. It seems to make

diff --git a/src/feature/control/control.c b/src/feature/control/control.c
index cc7ecff2fffd48917bf35125f418636e34cfb3ad..26ac12d3077ab9ff04c693210c1e8fdc150ab596 100644 (file)
--- a/src/feature/control/control.c
+++ b/src/feature/control/control.c
@@ -4934,7 +4934,7 @@ handle_control_add_onion(control_connection_t *conn,
   case RSAE_BADAUTH:
     connection_printf_to_buf(conn, "512 Invalid client authorization\r\n");
     break;
-  case RSAE_INTERNAL: /* FALLSTHROUGH */
+  case RSAE_INTERNAL: FALLTHROUGH;
   default:
     connection_printf_to_buf(conn, "551 Failed to add Onion Service\r\n");
   }

diff --git a/src/feature/dirclient/dirclient.c b/src/feature/dirclient/dirclient.c
index 0fd1a47017023253f4c415a0e87c8f35d29ff593..6725fc33692e891e833639d1dd431f2cf179010e 100644 (file)
--- a/src/feature/dirclient/dirclient.c
+++ b/src/feature/dirclient/dirclient.c
@@ -1369,7 +1369,7 @@ directory_initiate_request,(directory_request_t *request))
       case 1:
         /* start flushing conn */
         conn->base_.state = DIR_CONN_STATE_CLIENT_SENDING;
-        /* fall through */
+        FALLTHROUGH;
       case 0:
         /* queue the command on the outbuf */
         directory_send_command(conn, 1, request);

diff --git a/src/feature/dirparse/parsecommon.c b/src/feature/dirparse/parsecommon.c
index e8269f7ec77ca9ce3a3f54f57fc17aec4b5bb089..1664a77bbe04c856352e537c4a5e87924699fe2e 100644 (file)
--- 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);

diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c
index 38395862c383e5e57523303697186942de585444..e20a39482fdeadf61456ffef380be510c34b4c42 100644 (file)
--- a/src/feature/relay/dns.c
+++ b/src/feature/relay/dns.c
@@ -548,7 +548,7 @@ send_resolved_cell,(edge_connection_t *conn, uint8_t answer_type,
         answer_type = RESOLVED_TYPE_ERROR;
         /* We let this fall through and treat it as an error. */
       }
-      /* Falls through. */
+      FALLTHROUGH;
     case RESOLVED_TYPE_ERROR_TRANSIENT:
     case RESOLVED_TYPE_ERROR:
       {

diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c
index 4ca783c7c3abb55e962d6787bcce87e8f97b0a37..cde954da953bf59abd6bcbba4bc12893914ffd31 100644 (file)
--- a/src/feature/rend/rendclient.c
+++ b/src/feature/rend/rendclient.c
@@ -819,7 +819,7 @@ rend_client_report_intro_point_failure(extend_info_t *failed_intro,
         log_warn(LD_BUG, "Unknown failure type %u. Removing intro point.",
                  failure_type);
         tor_fragile_assert();
-        /* fall through */
+        FALLTHROUGH;
       case INTRO_POINT_FAILURE_GENERIC:
         rend_cache_intro_failure_note(failure_type,
                                       (uint8_t *)failed_intro->identity_digest,

diff --git a/src/lib/crypt_ops/crypto_digest.c b/src/lib/crypt_ops/crypto_digest.c
index 1b2724b2aad066abfbf5d2aabbcd056caef1a675..de81b87b7e738551ed205e4d7ceeb9287d74fcfd 100644 (file)
--- a/src/lib/crypt_ops/crypto_digest.c
+++ b/src/lib/crypt_ops/crypto_digest.c
@@ -50,8 +50,8 @@ digest_alg_to_nss_oid(digest_algorithm_t alg)
     case DIGEST_SHA1: return SEC_OID_SHA1;
     case DIGEST_SHA256: return SEC_OID_SHA256;
     case DIGEST_SHA512: return SEC_OID_SHA512;
-    case DIGEST_SHA3_256: /* Fall through */
-    case DIGEST_SHA3_512: /* Fall through */
+    case DIGEST_SHA3_256: FALLTHROUGH;
+    case DIGEST_SHA3_512: FALLTHROUGH;
     default:
       return SEC_OID_UNKNOWN;
   }
@@ -98,12 +98,12 @@ static bool
 library_supports_digest(digest_algorithm_t alg)
 {
   switch (alg) {
-    case DIGEST_SHA1: /* Fall through */
-    case DIGEST_SHA256: /* Fall through */
+    case DIGEST_SHA1: FALLTHROUGH;
+    case DIGEST_SHA256: FALLTHROUGH;
     case DIGEST_SHA512:
       return true;
-    case DIGEST_SHA3_256: /* Fall through */
-    case DIGEST_SHA3_512: /* Fall through */
+    case DIGEST_SHA3_256: FALLTHROUGH;
+    case DIGEST_SHA3_512: FALLTHROUGH;
     default:
       return false;
   }
@@ -313,8 +313,8 @@ crypto_digest_alloc_bytes(digest_algorithm_t alg)
                          STRUCT_FIELD_SIZE(crypto_digest_t, f))
   switch (alg) {
 #ifdef ENABLE_NSS
-    case DIGEST_SHA1: /* Fall through */
-    case DIGEST_SHA256: /* Fall through */
+    case DIGEST_SHA1: FALLTHROUGH;
+    case DIGEST_SHA256: FALLTHROUGH;
     case DIGEST_SHA512:
       return END_OF_FIELD(d.ctx);
 #else
@@ -349,8 +349,8 @@ crypto_digest_new_internal(digest_algorithm_t algorithm)
   switch (algorithm)
     {
 #ifdef ENABLE_NSS
-    case DIGEST_SHA1: /* fall through */
-    case DIGEST_SHA256: /* fall through */
+    case DIGEST_SHA1: FALLTHROUGH;
+    case DIGEST_SHA256: FALLTHROUGH;
     case DIGEST_SHA512:
       r->d.ctx = PK11_CreateDigestContext(digest_alg_to_nss_oid(algorithm));
       if (BUG(!r->d.ctx)) {
@@ -451,8 +451,8 @@ crypto_digest_add_bytes(crypto_digest_t *digest, const char *data,
    */
   switch (digest->algorithm) {
 #ifdef ENABLE_NSS
-    case DIGEST_SHA1: /* fall through */
-    case DIGEST_SHA256: /* fall through */
+    case DIGEST_SHA1: FALLTHROUGH;
+    case DIGEST_SHA256: FALLTHROUGH;
     case DIGEST_SHA512:
       tor_assert(len <= UINT_MAX);
       SECStatus s = PK11_DigestOp(digest->d.ctx,
@@ -471,7 +471,7 @@ crypto_digest_add_bytes(crypto_digest_t *digest, const char *data,
       SHA512_Update(&digest->d.sha512, (void*)data, len);
       break;
 #endif
-    case DIGEST_SHA3_256: /* FALLSTHROUGH */
+    case DIGEST_SHA3_256: FALLTHROUGH;
     case DIGEST_SHA3_512:
       keccak_digest_update(&digest->d.sha3, (const uint8_t *)data, len);
       break;
@@ -540,7 +540,7 @@ crypto_digest_get_digest(crypto_digest_t *digest,
       SHA512_Final(r, &tmpenv.d.sha512);
       break;
 //LCOV_EXCL_START
-    case DIGEST_SHA3_256: /* FALLSTHROUGH */
+    case DIGEST_SHA3_256: FALLTHROUGH;
     case DIGEST_SHA3_512:
     default:
       log_warn(LD_BUG, "Handling unexpected algorithm %d", digest->algorithm);

diff --git a/src/test/test_socks.c b/src/test/test_socks.c
index 783f4726ee6974767e4cec69331d325145301ffa..3686e1036b880e3bf1d08eed9c28079589b61b99 100644 (file)
--- a/src/test/test_socks.c
+++ b/src/test/test_socks.c
@@ -778,7 +778,7 @@ test_socks_truncated(void *ptr)
   for (i = 0; i < ARRAY_LENGTH(commands); ++i) {
     for (j = 0; j < commands[i].len; ++j) {
       switch (commands[i].setup) {
-        default: /* Falls through */
+        default: FALLTHROUGH;
         case NONE:
           /* This test calls for no setup on the socks state. */
           break;