Blame gcc7-implicit-fallthrough-complaining-fix.patch
|
Yunying Sun |
7afceb |
From 1321aee7d2a3be248d32b012ee6d2a4452435690 Mon Sep 17 00:00:00 2001
|
|
Yunying Sun |
7afceb |
From: Philip Tricca <flihp@twobit.us>
|
|
Yunying Sun |
7afceb |
Date: Thu, 27 Jul 2017 21:08:53 -0700
|
|
Yunying Sun |
7afceb |
Subject: [PATCH] gcc7: Change two case fallthrough conditions that upset gcc7.
|
|
Yunying Sun |
7afceb |
|
|
Yunying Sun |
7afceb |
Signed-off-by: Philip Tricca <flihp@twobit.us>
|
|
Yunying Sun |
7afceb |
---
|
|
Yunying Sun |
7afceb |
tools/main.c | 2 +-
|
|
Yunying Sun |
7afceb |
tools/tpm2_dump_capability.c | 2 +-
|
|
Yunying Sun |
7afceb |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
Yunying Sun |
7afceb |
|
|
Yunying Sun |
7afceb |
diff --git a/tools/main.c b/tools/main.c
|
|
Yunying Sun |
7afceb |
index 4f1fd83..67148be 100644
|
|
Yunying Sun |
7afceb |
--- a/tools/main.c
|
|
Yunying Sun |
7afceb |
+++ b/tools/main.c
|
|
Yunying Sun |
7afceb |
@@ -60,7 +60,7 @@ main (int argc,
|
|
Yunying Sun |
7afceb |
case 1:
|
|
Yunying Sun |
7afceb |
execute_man (argv[0], envp);
|
|
Yunying Sun |
7afceb |
LOG_ERR ("failed to load manpage, check your environment / PATH\n");
|
|
Yunying Sun |
7afceb |
- /* fallthrough */
|
|
Yunying Sun |
7afceb |
+ exit (1);
|
|
Yunying Sun |
7afceb |
case 2:
|
|
Yunying Sun |
7afceb |
exit (1);
|
|
Yunying Sun |
7afceb |
}
|
|
Yunying Sun |
7afceb |
diff --git a/tools/tpm2_dump_capability.c b/tools/tpm2_dump_capability.c
|
|
Yunying Sun |
7afceb |
index 728dce7..1c56dbc 100644
|
|
Yunying Sun |
7afceb |
--- a/tools/tpm2_dump_capability.c
|
|
Yunying Sun |
7afceb |
+++ b/tools/tpm2_dump_capability.c
|
|
Yunying Sun |
7afceb |
@@ -600,7 +600,7 @@ dump_tpm_capability (TPMU_CAPABILITIES *capabilities,
|
|
Yunying Sun |
7afceb |
case TPM_CAP_COMMANDS:
|
|
Yunying Sun |
7afceb |
dump_command_attr_array (capabilities->command.commandAttributes,
|
|
Yunying Sun |
7afceb |
capabilities->command.count);
|
|
Yunying Sun |
7afceb |
- /* fallthrough */
|
|
Yunying Sun |
7afceb |
+ break;
|
|
Yunying Sun |
7afceb |
default:
|
|
Yunying Sun |
7afceb |
return 1;
|
|
Yunying Sun |
7afceb |
}
|
|
Yunying Sun |
7afceb |
--
|
|
Yunying Sun |
7afceb |
1.8.3.1
|
|
Yunying Sun |
7afceb |
|