summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2018-05-08 12:45:00 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2018-05-08 12:45:00 -0700
commit6d36d8684cea66143ae7b415dbe9cff88b0bff81 (patch)
treeb17f8717b35c9d966d278a6d9cdf96f307cc9bda
parentf0ceb1e122dc3523123dd8dfd6113f2e68451452 (diff)
downloadnasm-6d36d8684cea66143ae7b415dbe9cff88b0bff81.tar.gz
Fix implicit fallthrough that trips -Werror
-Werror now trips on implicit fallthroughs. There is also at least one that probably should not be, although it appears to be harmless. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--asm/listing.c5
-rw-r--r--rdoff/rdflib.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/asm/listing.c b/asm/listing.c
index 9409aa90..40af8a62 100644
--- a/asm/listing.c
+++ b/asm/listing.c
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------- *
*
- * Copyright 1996-2016 The NASM Authors - All Rights Reserved
+ * Copyright 1996-2018 The NASM Authors - All Rights Reserved
* See the file AUTHORS included with the NASM distribution for
* the specific copyright holders.
*
@@ -213,10 +213,11 @@ static void list_output(const struct out_data *data)
if (size > 16) {
snprintf(q, sizeof(q), "<zero %08"PRIX64">", size);
list_out(offset, q);
+ break;
} else {
p = zero_buffer;
- /* fall through */
}
+ /* fall through */
case OUT_RAWDATA:
{
if (size == 0 && !listdata[0])
diff --git a/rdoff/rdflib.c b/rdoff/rdflib.c
index ee7f19f6..b85b383f 100644
--- a/rdoff/rdflib.c
+++ b/rdoff/rdflib.c
@@ -233,6 +233,7 @@ int main(int argc, char **argv)
fprintf(stderr, "rdflib: required parameter missing\n");
exit(1);
}
+ break;
case 't':
fp = fopen(argv[2], "rb");
if (!fp) {
@@ -317,6 +318,8 @@ int main(int argc, char **argv)
case 'r': /* replace module */
argc--;
+ /* fall through */
+
case 'd': /* delete module */
if (argc < 4) {
fprintf(stderr, "rdflib: required parameter missing\n");