diff options
Diffstat (limited to 'meta-openstack/recipes-extended/uwsgi/files/Add-explicit-breaks-to-avoid-implicit-passthrough.patch')
| -rw-r--r-- | meta-openstack/recipes-extended/uwsgi/files/Add-explicit-breaks-to-avoid-implicit-passthrough.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/meta-openstack/recipes-extended/uwsgi/files/Add-explicit-breaks-to-avoid-implicit-passthrough.patch b/meta-openstack/recipes-extended/uwsgi/files/Add-explicit-breaks-to-avoid-implicit-passthrough.patch new file mode 100644 index 0000000..4b9c015 --- /dev/null +++ b/meta-openstack/recipes-extended/uwsgi/files/Add-explicit-breaks-to-avoid-implicit-passthrough.patch | |||
| @@ -0,0 +1,50 @@ | |||
| 1 | From 0a14d0f0425f00421a69f0ca8e09a92cfdfc6a36 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Paul Tagliamonte <paultag@gmail.com> | ||
| 3 | Date: Mon, 7 Aug 2017 11:18:56 -0400 | ||
| 4 | Subject: [PATCH] Add explicit breaks to avoid implicit passthrough. | ||
| 5 | |||
| 6 | commit 0a14d0f0425f00421a69f0ca8e09a92cfdfc6a36 from upstream | ||
| 7 | git://github.com/unbit/uwsgi.git | ||
| 8 | |||
| 9 | -Werror=implicit-fallthrough was added in gcc 7.1, which will | ||
| 10 | throw a compile error if a switch has an implicit passthrough. | ||
| 11 | |||
| 12 | Seeing as how this switch doesn't appear to depend on passthrough to | ||
| 13 | function correctly, I've added explicit breaks to the switch. | ||
| 14 | |||
| 15 | From https://gcc.gnu.org/gcc-7/changes.html: | ||
| 16 | |||
| 17 | -Wimplicit-fallthrough warns when a switch case falls through. This | ||
| 18 | warning has five different levels. The compiler is able to parse a wide | ||
| 19 | range of fallthrough comments, depending on the level. It also handles | ||
| 20 | control-flow statements, such as ifs. It's possible to suppress the | ||
| 21 | warning by either adding a fallthrough comment, or by using a null | ||
| 22 | statement: __attribute__ ((fallthrough)); (C, C++), or [[fallthrough]]; | ||
| 23 | (C++17), or [[gnu::fallthrough]]; (C++11/C++14). This warning is enabled | ||
| 24 | by -Wextra. | ||
| 25 | --- | ||
| 26 | core/hash.c | 3 +++ | ||
| 27 | 1 file changed, 3 insertions(+) | ||
| 28 | |||
| 29 | diff --git a/core/hash.c b/core/hash.c | ||
| 30 | index a1288fa..9ae6bd2 100644 | ||
| 31 | --- a/core/hash.c | ||
| 32 | +++ b/core/hash.c | ||
| 33 | @@ -42,11 +42,14 @@ static uint32_t murmur2_hash(char *key, uint64_t keylen) { | ||
| 34 | switch (keylen) { | ||
| 35 | case 3: | ||
| 36 | h ^= key[2] << 16; | ||
| 37 | + break; | ||
| 38 | case 2: | ||
| 39 | h ^= key[1] << 8; | ||
| 40 | + break; | ||
| 41 | case 1: | ||
| 42 | h ^= key[0]; | ||
| 43 | h *= 0x5bd1e995; | ||
| 44 | + break; | ||
| 45 | } | ||
| 46 | |||
| 47 | h ^= h >> 13; | ||
| 48 | -- | ||
| 49 | 2.7.4 | ||
| 50 | |||
