Patchwork bios: mtrr: make the failed flag a boolean

login
register
mail settings
Submitter Colin King
Date Dec. 7, 2012, 12:16 a.m.
Message ID <1354839367-6865-1-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/204354/
State Accepted
Headers show

Comments

Colin King - Dec. 7, 2012, 12:16 a.m.
From: Colin Ian King <colin.king@canonical.com>

Make the failed flag a boolean.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 src/bios/mtrr/mtrr.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
Alex Hung - Dec. 13, 2012, 2:11 a.m.
On 12/07/2012 08:16 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Make the failed flag a boolean.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/bios/mtrr/mtrr.c | 9 +++++----
>   1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/src/bios/mtrr/mtrr.c b/src/bios/mtrr/mtrr.c
> index e2ee506..8bb4b0f 100644
> --- a/src/bios/mtrr/mtrr.c
> +++ b/src/bios/mtrr/mtrr.c
> @@ -26,6 +26,7 @@
>   #include <stdlib.h>
>   #include <stdio.h>
>   #include <string.h>
> +#include <stdbool.h>
>   #include <sys/types.h>
>   #include <sys/stat.h>
>   #include <sys/ioctl.h>
> @@ -420,22 +421,22 @@ static int mtrr_test1(fwts_framework *fw)
>   static int mtrr_test2(fwts_framework *fw)
>   {
>   	if (klog != NULL) {
> -		int failed = 0;
> +		bool failed = false;
>
>   		if (fwts_klog_regex_find(fw, klog, "mtrr: your CPUs had inconsistent fixed MTRR settings") > 0) {
>   			fwts_log_info(fw, "Detected CPUs with inconsistent fixed MTRR settings which the kernel fixed.");
>   			fwts_tag_failed(fw, FWTS_TAG_BIOS);
> -			failed = 1;
> +			failed = true;
>   		}
>   		if (fwts_klog_regex_find(fw, klog, "mtrr: your CPUs had inconsistent variable MTRR settings") > 0) {
>   			fwts_log_info(fw, "Detected CPUs with inconsistent variable MTRR settings which the kernel fixed.");
>   			fwts_tag_failed(fw, FWTS_TAG_BIOS);
> -			failed = 1;
> +			failed = true;
>   		}
>   		if (fwts_klog_regex_find(fw, klog, "mtrr: your CPUs had inconsistent MTRRdefType") > 0) {
>   			fwts_log_info(fw, "Detected CPUs with inconsistent variable MTRR settings which the kernel fixed.");
>   			fwts_tag_failed(fw, FWTS_TAG_BIOS);
> -			failed = 1;
> +			failed = true;
>   		}
>
>   		if (failed)
>
Acked-by: Alex Hung <alex.hung@canonical.com>
Ivan Hu - Dec. 13, 2012, 9:44 a.m.
On 12/07/2012 08:16 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Make the failed flag a boolean.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/bios/mtrr/mtrr.c | 9 +++++----
>   1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/src/bios/mtrr/mtrr.c b/src/bios/mtrr/mtrr.c
> index e2ee506..8bb4b0f 100644
> --- a/src/bios/mtrr/mtrr.c
> +++ b/src/bios/mtrr/mtrr.c
> @@ -26,6 +26,7 @@
>   #include <stdlib.h>
>   #include <stdio.h>
>   #include <string.h>
> +#include <stdbool.h>
>   #include <sys/types.h>
>   #include <sys/stat.h>
>   #include <sys/ioctl.h>
> @@ -420,22 +421,22 @@ static int mtrr_test1(fwts_framework *fw)
>   static int mtrr_test2(fwts_framework *fw)
>   {
>   	if (klog != NULL) {
> -		int failed = 0;
> +		bool failed = false;
>
>   		if (fwts_klog_regex_find(fw, klog, "mtrr: your CPUs had inconsistent fixed MTRR settings") > 0) {
>   			fwts_log_info(fw, "Detected CPUs with inconsistent fixed MTRR settings which the kernel fixed.");
>   			fwts_tag_failed(fw, FWTS_TAG_BIOS);
> -			failed = 1;
> +			failed = true;
>   		}
>   		if (fwts_klog_regex_find(fw, klog, "mtrr: your CPUs had inconsistent variable MTRR settings") > 0) {
>   			fwts_log_info(fw, "Detected CPUs with inconsistent variable MTRR settings which the kernel fixed.");
>   			fwts_tag_failed(fw, FWTS_TAG_BIOS);
> -			failed = 1;
> +			failed = true;
>   		}
>   		if (fwts_klog_regex_find(fw, klog, "mtrr: your CPUs had inconsistent MTRRdefType") > 0) {
>   			fwts_log_info(fw, "Detected CPUs with inconsistent variable MTRR settings which the kernel fixed.");
>   			fwts_tag_failed(fw, FWTS_TAG_BIOS);
> -			failed = 1;
> +			failed = true;
>   		}
>
>   		if (failed)
>
Acked-by: Ivan Hu <ivan.hu@canonical.com>

Patch

diff --git a/src/bios/mtrr/mtrr.c b/src/bios/mtrr/mtrr.c
index e2ee506..8bb4b0f 100644
--- a/src/bios/mtrr/mtrr.c
+++ b/src/bios/mtrr/mtrr.c
@@ -26,6 +26,7 @@ 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdbool.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
@@ -420,22 +421,22 @@  static int mtrr_test1(fwts_framework *fw)
 static int mtrr_test2(fwts_framework *fw)
 {
 	if (klog != NULL) {
-		int failed = 0;
+		bool failed = false;
 
 		if (fwts_klog_regex_find(fw, klog, "mtrr: your CPUs had inconsistent fixed MTRR settings") > 0) {
 			fwts_log_info(fw, "Detected CPUs with inconsistent fixed MTRR settings which the kernel fixed.");
 			fwts_tag_failed(fw, FWTS_TAG_BIOS);
-			failed = 1;
+			failed = true;
 		}
 		if (fwts_klog_regex_find(fw, klog, "mtrr: your CPUs had inconsistent variable MTRR settings") > 0) {
 			fwts_log_info(fw, "Detected CPUs with inconsistent variable MTRR settings which the kernel fixed.");
 			fwts_tag_failed(fw, FWTS_TAG_BIOS);
-			failed = 1;
+			failed = true;
 		}
 		if (fwts_klog_regex_find(fw, klog, "mtrr: your CPUs had inconsistent MTRRdefType") > 0) {
 			fwts_log_info(fw, "Detected CPUs with inconsistent variable MTRR settings which the kernel fixed.");
 			fwts_tag_failed(fw, FWTS_TAG_BIOS);
-			failed = 1;
+			failed = true;
 		}
 
 		if (failed)