[PATCH 0/3] Style cleanups

[Jan Kiszka]

Fixes one coverity warning and otherwise does some cosmetic cleanups.

Jan

Jan Kiszka (3):
Annotate when we ignore return value of uefi_call_wrapper
Consolidate over VOID type capitalization in bootloader core
Declare save_current_config static

env/fatvars.c | 4 ++--
env/syspart.c | 2 +-
include/utils.h | 2 +-
utils.c | 8 ++++----
4 files changed, 8 insertions(+), 8 deletions(-)

--
2.26.2

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

No functional changes.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---

env/fatvars.c | 4 ++--
env/syspart.c | 2 +-
include/utils.h | 2 +-

utils.c | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/env/fatvars.c b/env/fatvars.c
index 45901fb..7b19b66 100644
--- a/env/fatvars.c
+++ b/env/fatvars.c
@@ -23,7 +23,7 @@
static int current_partition = 0;
static BG_ENVDATA env[ENV_NUM_CONFIG_PARTS];

-BG_STATUS save_current_config(void)
+BG_STATUS save_current_config(VOID)
{
BG_STATUS result = BG_CONFIG_ERROR;
EFI_STATUS efistatus;
@@ -233,6 +233,6 @@ lc_cleanup:

BG_STATUS save_config(BG_LOADER_PARAMS *bglp)
{
- (void)bglp;
+ (VOID)bglp;
return BG_NOT_IMPLEMENTED;
}
diff --git a/env/syspart.c b/env/syspart.c
index a42d371..366a106 100644
--- a/env/syspart.c
+++ b/env/syspart.c
@@ -51,7 +51,7 @@ EFI_STATUS enumerate_cfg_parts(UINTN *config_volumes, UINTN *numHandles)
return EFI_SUCCESS;
}

-static void swap_uintn(UINTN *a, UINTN *b)
+static VOID swap_uintn(UINTN *a, UINTN *b)
{
UINTN tmp;
tmp = *a;
diff --git a/include/utils.h b/include/utils.h
index f83d6b4..084796e 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -32,7 +32,7 @@ extern UINTN volume_count;

typedef enum { DOSFSLABEL, CUSTOMLABEL, NOLABEL } LABELMODE;

-void __attribute__((noreturn)) error_exit(CHAR16 *message, EFI_STATUS status);
+VOID __attribute__((noreturn)) error_exit(CHAR16 *message, EFI_STATUS status);
CHAR16 *get_volume_label(EFI_FILE_HANDLE fh);
EFI_STATUS get_volumes(VOLUME_DESC **volumes, UINTN *count);
EFI_STATUS close_volumes(VOLUME_DESC *volumes, UINTN count);
diff --git a/utils.c b/utils.c
index 9528bc5..3becc62 100644
--- a/utils.c
+++ b/utils.c
@@ -49,7 +49,7 @@ BOOLEAN IsOnBootMedium(EFI_DEVICE_PATH *dp)
return result;
}

-void __attribute__((noreturn)) error_exit(CHAR16 *message, EFI_STATUS status)
+VOID __attribute__((noreturn)) error_exit(CHAR16 *message, EFI_STATUS status)
{
ERROR(L"%s ( %r )\n", message, status);
(VOID)uefi_call_wrapper(BS->Stall, 1, 3 * 1000 * 1000);
@@ -96,7 +96,7 @@ CHAR16 *get_volume_custom_label(EFI_FILE_HANDLE fh)
return NULL;
}
buffer[buffsize] = L'\0';
- (void)uefi_call_wrapper(fh->Close, 1, tmp);
+ (VOID)uefi_call_wrapper(fh->Close, 1, tmp);
return buffer;
}

--
2.26.2

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

Inconsistency was noted by coverity.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---

utils.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils.c b/utils.c
index ace4689..9528bc5 100644
--- a/utils.c
+++ b/utils.c
@@ -52,8 +52,8 @@ BOOLEAN IsOnBootMedium(EFI_DEVICE_PATH *dp)
void __attribute__((noreturn)) error_exit(CHAR16 *message, EFI_STATUS status)

{
ERROR(L"%s ( %r )\n", message, status);

- uefi_call_wrapper(BS->Stall, 1, 3 * 1000 * 1000);
- uefi_call_wrapper(BS->Exit, 4, this_image, status, 0, NULL);
+ (VOID)uefi_call_wrapper(BS->Stall, 1, 3 * 1000 * 1000);
+ (VOID)uefi_call_wrapper(BS->Exit, 4, this_image, status, 0, NULL);
__builtin_unreachable();
}

--
2.26.2

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

Only locally used.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---

env/fatvars.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/env/fatvars.c b/env/fatvars.c
index 7b19b66..8a8e09e 100644

--- a/env/fatvars.c
+++ b/env/fatvars.c
@@ -23,7 +23,7 @@
static int current_partition = 0;
static BG_ENVDATA env[ENV_NUM_CONFIG_PARTS];

-BG_STATUS save_current_config(VOID)
+static BG_STATUS save_current_config(VOID)

{
BG_STATUS result = BG_CONFIG_ERROR;
EFI_STATUS efistatus;

--
2.26.2