Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
"Fix" -Wimplicit-fallthrough warnings
Baptiste Daroussin committed 7 years ago
commit 330e309dff3f6d3967f05e1558fcafe04f2396bb
parent fdc713c
5 files changed +26 -24
modified external/include/siphash.h
@@ -189,13 +189,13 @@ static inline uint64_t sip24_final(struct siphash *H) {
	uint64_t b = (H->c + left) << 56;

	switch (left) {
-
	case 7: b |= (uint64_t)H->buf[6] << 48;
-
	case 6: b |= (uint64_t)H->buf[5] << 40;
-
	case 5: b |= (uint64_t)H->buf[4] << 32;
-
	case 4: b |= (uint64_t)H->buf[3] << 24;
-
	case 3: b |= (uint64_t)H->buf[2] << 16;
-
	case 2: b |= (uint64_t)H->buf[1] << 8;
-
	case 1: b |= (uint64_t)H->buf[0] << 0;
+
	case 7: b |= (uint64_t)H->buf[6] << 48; /* FALLTHRU */
+
	case 6: b |= (uint64_t)H->buf[5] << 40; /* FALLTHRU */
+
	case 5: b |= (uint64_t)H->buf[4] << 32; /* FALLTHRU */
+
	case 4: b |= (uint64_t)H->buf[3] << 24; /* FALLTHRU */
+
	case 3: b |= (uint64_t)H->buf[2] << 16; /* FALLTHRU */
+
	case 2: b |= (uint64_t)H->buf[1] << 8; /* FALLTHRU */
+
	case 1: b |= (uint64_t)H->buf[0] << 0; /* FALLTHRU */
	case 0: break;
	}

modified external/uthash/uthash.h
@@ -438,17 +438,17 @@ do {
  }                                                                              \
  hashv += keylen;                                                               \
  switch ( _hj_k ) {                                                             \
-
     case 11: hashv += ( (unsigned)_hj_key[10] << 24 );                          \
-
     case 10: hashv += ( (unsigned)_hj_key[9] << 16 );                           \
-
     case 9:  hashv += ( (unsigned)_hj_key[8] << 8 );                            \
-
     case 8:  _hj_j += ( (unsigned)_hj_key[7] << 24 );                           \
-
     case 7:  _hj_j += ( (unsigned)_hj_key[6] << 16 );                           \
-
     case 6:  _hj_j += ( (unsigned)_hj_key[5] << 8 );                            \
-
     case 5:  _hj_j += _hj_key[4];                                               \
-
     case 4:  _hj_i += ( (unsigned)_hj_key[3] << 24 );                           \
-
     case 3:  _hj_i += ( (unsigned)_hj_key[2] << 16 );                           \
-
     case 2:  _hj_i += ( (unsigned)_hj_key[1] << 8 );                            \
-
     case 1:  _hj_i += _hj_key[0];                                               \
+
     case 11: hashv += ( (unsigned)_hj_key[10] << 24 );    /* FALLTHRU */        \
+
     case 10: hashv += ( (unsigned)_hj_key[9] << 16 );     /* FALLTHRU */        \
+
     case 9:  hashv += ( (unsigned)_hj_key[8] << 8 );      /* FALLTHRU */        \
+
     case 8:  _hj_j += ( (unsigned)_hj_key[7] << 24 );     /* FALLTHRU */        \
+
     case 7:  _hj_j += ( (unsigned)_hj_key[6] << 16 );     /* FALLTHRU */        \
+
     case 6:  _hj_j += ( (unsigned)_hj_key[5] << 8 );      /* FALLTHRU */        \
+
     case 5:  _hj_j += _hj_key[4];                         /* FALLTHRU */        \
+
     case 4:  _hj_i += ( (unsigned)_hj_key[3] << 24 );     /* FALLTHRU */        \
+
     case 3:  _hj_i += ( (unsigned)_hj_key[2] << 16 );     /* FALLTHRU */        \
+
     case 2:  _hj_i += ( (unsigned)_hj_key[1] << 8 );      /* FALLTHRU */        \
+
     case 1:  _hj_i += _hj_key[0];                         /* FALLTHRU */        \
  }                                                                              \
  HASH_JEN_MIX(_hj_i, _hj_j, hashv);                                             \
  bkt = hashv & (num_bkts-1);                                                    \
modified libpkg/packing.c
@@ -318,18 +318,18 @@ packing_set_format(struct archive *a, pkg_formats format)
	case TXZ:
		if (archive_write_add_filter_xz(a) == ARCHIVE_OK)
			return ("txz");
-
		else
-
			pkg_emit_error(notsupp_fmt, "xz", "bzip2");
+
		pkg_emit_error(notsupp_fmt, "xz", "bzip2");
+
		/* FALLTHRU */
	case TBZ:
		if (archive_write_add_filter_bzip2(a) == ARCHIVE_OK)
			return ("tbz");
-
		else
-
			pkg_emit_error(notsupp_fmt, "bzip2", "gzip");
+
		pkg_emit_error(notsupp_fmt, "bzip2", "gzip");
+
		/* FALLTHRU */
	case TGZ:
		if (archive_write_add_filter_gzip(a) == ARCHIVE_OK)
			return ("tgz");
-
		else
-
			pkg_emit_error(notsupp_fmt, "gzip", "plain tar");
+
		pkg_emit_error(notsupp_fmt, "gzip", "plain tar");
+
		/* FALLTHRU */
	case TAR:
		archive_write_add_filter_none(a);
		return ("tar");
modified libpkg/pkg_ports.c
@@ -1153,6 +1153,7 @@ plist_parse_line(struct plist *plist, char *line)
		case EPKG_UNKNOWN:
			pkg_emit_error("unknown keyword %s: %s",
			    keyword, line);
+
			/* FALLTHRU */
		case EPKG_FATAL:
			return (EPKG_FATAL);
		}
modified libpkg/utils.c
@@ -256,6 +256,7 @@ format_exec_cmd(char **dest, const char *in, const char *prefix,
			 * given (default exec) %@ does not
			 * exists
			 */
+
			/* FALLTHRU */
		case '#':
			utstring_printf(buf, "%c", argc);
			break;