diff mbox

acpi: lid: Fix nesting bug

Message ID 1367914084-16156-1-git-send-email-colin.king@canonical.com
State Accepted
Headers show

Commit Message

Colin Ian King May 7, 2013, 8:08 a.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

Coverity CID #997282: Nesting level does not match indentation

Nest correctly.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 src/acpi/lid/lid.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Alex Hung May 8, 2013, 2:18 a.m. UTC | #1 
On 05/07/2013 04:08 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Coverity CID #997282: Nesting level does not match indentation
>
> Nest correctly.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/acpi/lid/lid.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/acpi/lid/lid.c b/src/acpi/lid/lid.c
> index 9117fc8..65fdc8a 100644
> --- a/src/acpi/lid/lid.c
> +++ b/src/acpi/lid/lid.c
> @@ -146,7 +146,7 @@ static int lid_test_state(fwts_framework *fw, int button)
>   			"Did not detect any ACPI LID events while waiting for to LID %s.", state);
>   		fwts_tag_failed(fw, FWTS_TAG_ACPI_LID);
>   		fwts_tag_failed(fw, FWTS_TAG_ACPI_EVENT);
> -	} else
> +	} else {
>   		fwts_passed(fw, "Detected ACPI LID events while waiting for LID to %s.", state);
>   		if ((matching == 0) || (not_matching > 0)) {
>   			fwts_failed(fw, LOG_LEVEL_HIGH, "NoLidState",
> @@ -154,6 +154,7 @@ static int lid_test_state(fwts_framework *fw, int button)
>   			fwts_tag_failed(fw, FWTS_TAG_ACPI_LID);
>   		} else
>   			fwts_passed(fw, "Detected lid %s state.", state);
> +	}
>
>   	return FWTS_OK;
>   }
>
Acked-by: Alex Hung <alex.hung@canonical.com>
Keng-Yu Lin May 20, 2013, 7:32 a.m. UTC | #2 
On Tue, May 7, 2013 at 4:08 PM, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Coverity CID #997282: Nesting level does not match indentation
>
> Nest correctly.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  src/acpi/lid/lid.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/acpi/lid/lid.c b/src/acpi/lid/lid.c
> index 9117fc8..65fdc8a 100644
> --- a/src/acpi/lid/lid.c
> +++ b/src/acpi/lid/lid.c
> @@ -146,7 +146,7 @@ static int lid_test_state(fwts_framework *fw, int button)
>                         "Did not detect any ACPI LID events while waiting for to LID %s.", state);
>                 fwts_tag_failed(fw, FWTS_TAG_ACPI_LID);
>                 fwts_tag_failed(fw, FWTS_TAG_ACPI_EVENT);
> -       } else
> +       } else {
>                 fwts_passed(fw, "Detected ACPI LID events while waiting for LID to %s.", state);
>                 if ((matching == 0) || (not_matching > 0)) {
>                         fwts_failed(fw, LOG_LEVEL_HIGH, "NoLidState",
> @@ -154,6 +154,7 @@ static int lid_test_state(fwts_framework *fw, int button)
>                         fwts_tag_failed(fw, FWTS_TAG_ACPI_LID);
>                 } else
>                         fwts_passed(fw, "Detected lid %s state.", state);
> +       }
>
>         return FWTS_OK;
>  }
> --
> 1.8.1.2
>
Acked-by: Keng-Yu Lin <kengyu@canonical.com>
diff mbox

Patch

diff --git a/src/acpi/lid/lid.c b/src/acpi/lid/lid.c
index 9117fc8..65fdc8a 100644
--- a/src/acpi/lid/lid.c
+++ b/src/acpi/lid/lid.c
@@ -146,7 +146,7 @@  static int lid_test_state(fwts_framework *fw, int button)
 			"Did not detect any ACPI LID events while waiting for to LID %s.", state);
 		fwts_tag_failed(fw, FWTS_TAG_ACPI_LID);
 		fwts_tag_failed(fw, FWTS_TAG_ACPI_EVENT);
-	} else
+	} else {
 		fwts_passed(fw, "Detected ACPI LID events while waiting for LID to %s.", state);
 		if ((matching == 0) || (not_matching > 0)) {
 			fwts_failed(fw, LOG_LEVEL_HIGH, "NoLidState",
@@ -154,6 +154,7 @@  static int lid_test_state(fwts_framework *fw, int button)
 			fwts_tag_failed(fw, FWTS_TAG_ACPI_LID);
 		} else
 			fwts_passed(fw, "Detected lid %s state.", state);
+	}
 
 	return FWTS_OK;
 }