diff mbox

uefi: uefirtvariable: fix trivial indentation issues

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

Commit Message

Colin Ian King March 4, 2016, 12:36 a.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

fix indentation, no functional change

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 src/uefi/uefirtvariable/uefirtvariable.c | 36 ++++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

Comments

Ivan Hu March 4, 2016, 7:55 a.m. UTC | #1 
On 2016年03月04日 08:36, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> fix indentation, no functional change
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/uefi/uefirtvariable/uefirtvariable.c | 36 ++++++++++++++++----------------
>   1 file changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/src/uefi/uefirtvariable/uefirtvariable.c b/src/uefi/uefirtvariable/uefirtvariable.c
> index a135ea5..63b388d 100644
> --- a/src/uefi/uefirtvariable/uefirtvariable.c
> +++ b/src/uefi/uefirtvariable/uefirtvariable.c
> @@ -671,7 +671,7 @@ static int getnextvariable_test3(fwts_framework *fw)
>   				uint16_t *tmp;
>   				tmp = realloc(variablename,
>   					      sizeof(uint16_t) * variablenamesize);
> -				 if (tmp) {
> +				if (tmp) {
>   					variablename = tmp;
>   					getnextvariablename.VariableName = variablename;
>   					maxvariablenamesize = variablenamesize;
> @@ -1343,24 +1343,24 @@ static int setvariable_test7(fwts_framework *fw)
>   
>   	attr = attributes | FWTS_UEFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS | FWTS_UEFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS;
>   	ret = setvariable_invalidattr(fw, attr, datasize, variablenametest, &gtestguid1, datadiff);
> -		if (ret == FWTS_ERROR) {
> -			fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFIRuntimeSetVariable",
> -				"Successfully set variable with both authenticated (EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS "
> -				"EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) attributes are set, expected fail.");
> -			setvariable_insertvariable(fw, 0, datasize, variablenametest, &gtestguid1, datadiff);
> -			return FWTS_ERROR;
> -		}
> +	if (ret == FWTS_ERROR) {
> +		fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFIRuntimeSetVariable",
> +			"Successfully set variable with both authenticated (EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS "
> +			"EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) attributes are set, expected fail.");
> +		setvariable_insertvariable(fw, 0, datasize, variablenametest, &gtestguid1, datadiff);
> +		return FWTS_ERROR;
> +	}
>   
> -		if (setvariable_checkvariable_notfound(fw, variablenametest,
> -			&gtestguid1) == FWTS_ERROR) {
> -			fwts_log_info(fw,
> -				"Get the variable which is set by SetVariable with both "
> -				"authenticated (EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS "
> -				"EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) "
> -				"attributes are set %" PRIu32 " , test failed.", attr);
> -			setvariable_insertvariable(fw, 0, datasize, variablenametest, &gtestguid1, datadiff);
> -			return FWTS_ERROR;
> -		}
> +	if (setvariable_checkvariable_notfound(fw, variablenametest,
> +		&gtestguid1) == FWTS_ERROR) {
> +		fwts_log_info(fw,
> +			"Get the variable which is set by SetVariable with both "
> +			"authenticated (EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS "
> +			"EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) "
> +			"attributes are set %" PRIu32 " , test failed.", attr);
> +		setvariable_insertvariable(fw, 0, datasize, variablenametest, &gtestguid1, datadiff);
> +		return FWTS_ERROR;
> +	}
>   	return FWTS_OK;
>   }
>   
Acked-by: Ivan Hu <ivan.hu@canonical.com>
Alex Hung March 7, 2016, 10:17 a.m. UTC | #2 
On 03/03/2016 04:36 PM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> fix indentation, no functional change
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/uefi/uefirtvariable/uefirtvariable.c | 36 ++++++++++++++++----------------
>   1 file changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/src/uefi/uefirtvariable/uefirtvariable.c b/src/uefi/uefirtvariable/uefirtvariable.c
> index a135ea5..63b388d 100644
> --- a/src/uefi/uefirtvariable/uefirtvariable.c
> +++ b/src/uefi/uefirtvariable/uefirtvariable.c
> @@ -671,7 +671,7 @@ static int getnextvariable_test3(fwts_framework *fw)
>   				uint16_t *tmp;
>   				tmp = realloc(variablename,
>   					      sizeof(uint16_t) * variablenamesize);
> -				 if (tmp) {
> +				if (tmp) {
>   					variablename = tmp;
>   					getnextvariablename.VariableName = variablename;
>   					maxvariablenamesize = variablenamesize;
> @@ -1343,24 +1343,24 @@ static int setvariable_test7(fwts_framework *fw)
>
>   	attr = attributes | FWTS_UEFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS | FWTS_UEFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS;
>   	ret = setvariable_invalidattr(fw, attr, datasize, variablenametest, &gtestguid1, datadiff);
> -		if (ret == FWTS_ERROR) {
> -			fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFIRuntimeSetVariable",
> -				"Successfully set variable with both authenticated (EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS "
> -				"EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) attributes are set, expected fail.");
> -			setvariable_insertvariable(fw, 0, datasize, variablenametest, &gtestguid1, datadiff);
> -			return FWTS_ERROR;
> -		}
> +	if (ret == FWTS_ERROR) {
> +		fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFIRuntimeSetVariable",
> +			"Successfully set variable with both authenticated (EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS "
> +			"EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) attributes are set, expected fail.");
> +		setvariable_insertvariable(fw, 0, datasize, variablenametest, &gtestguid1, datadiff);
> +		return FWTS_ERROR;
> +	}
>
> -		if (setvariable_checkvariable_notfound(fw, variablenametest,
> -			&gtestguid1) == FWTS_ERROR) {
> -			fwts_log_info(fw,
> -				"Get the variable which is set by SetVariable with both "
> -				"authenticated (EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS "
> -				"EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) "
> -				"attributes are set %" PRIu32 " , test failed.", attr);
> -			setvariable_insertvariable(fw, 0, datasize, variablenametest, &gtestguid1, datadiff);
> -			return FWTS_ERROR;
> -		}
> +	if (setvariable_checkvariable_notfound(fw, variablenametest,
> +		&gtestguid1) == FWTS_ERROR) {
> +		fwts_log_info(fw,
> +			"Get the variable which is set by SetVariable with both "
> +			"authenticated (EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS "
> +			"EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) "
> +			"attributes are set %" PRIu32 " , test failed.", attr);
> +		setvariable_insertvariable(fw, 0, datasize, variablenametest, &gtestguid1, datadiff);
> +		return FWTS_ERROR;
> +	}
>   	return FWTS_OK;
>   }
>
>
Acked-by: Alex Hung <alex.hung@canonical.com>
diff mbox

Patch

diff --git a/src/uefi/uefirtvariable/uefirtvariable.c b/src/uefi/uefirtvariable/uefirtvariable.c
index a135ea5..63b388d 100644
--- a/src/uefi/uefirtvariable/uefirtvariable.c
+++ b/src/uefi/uefirtvariable/uefirtvariable.c
@@ -671,7 +671,7 @@  static int getnextvariable_test3(fwts_framework *fw)
 				uint16_t *tmp;
 				tmp = realloc(variablename,
 					      sizeof(uint16_t) * variablenamesize);
-				 if (tmp) {
+				if (tmp) {
 					variablename = tmp;
 					getnextvariablename.VariableName = variablename;
 					maxvariablenamesize = variablenamesize;
@@ -1343,24 +1343,24 @@  static int setvariable_test7(fwts_framework *fw)
 
 	attr = attributes | FWTS_UEFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS | FWTS_UEFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS;
 	ret = setvariable_invalidattr(fw, attr, datasize, variablenametest, &gtestguid1, datadiff);
-		if (ret == FWTS_ERROR) {
-			fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFIRuntimeSetVariable",
-				"Successfully set variable with both authenticated (EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS "
-				"EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) attributes are set, expected fail.");
-			setvariable_insertvariable(fw, 0, datasize, variablenametest, &gtestguid1, datadiff);
-			return FWTS_ERROR;
-		}
+	if (ret == FWTS_ERROR) {
+		fwts_failed(fw, LOG_LEVEL_MEDIUM, "UEFIRuntimeSetVariable",
+			"Successfully set variable with both authenticated (EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS "
+			"EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) attributes are set, expected fail.");
+		setvariable_insertvariable(fw, 0, datasize, variablenametest, &gtestguid1, datadiff);
+		return FWTS_ERROR;
+	}
 
-		if (setvariable_checkvariable_notfound(fw, variablenametest,
-			&gtestguid1) == FWTS_ERROR) {
-			fwts_log_info(fw,
-				"Get the variable which is set by SetVariable with both "
-				"authenticated (EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS "
-				"EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) "
-				"attributes are set %" PRIu32 " , test failed.", attr);
-			setvariable_insertvariable(fw, 0, datasize, variablenametest, &gtestguid1, datadiff);
-			return FWTS_ERROR;
-		}
+	if (setvariable_checkvariable_notfound(fw, variablenametest,
+		&gtestguid1) == FWTS_ERROR) {
+		fwts_log_info(fw,
+			"Get the variable which is set by SetVariable with both "
+			"authenticated (EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS "
+			"EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) "
+			"attributes are set %" PRIu32 " , test failed.", attr);
+		setvariable_insertvariable(fw, 0, datasize, variablenametest, &gtestguid1, datadiff);
+		return FWTS_ERROR;
+	}
 	return FWTS_OK;
 }