leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efi_selftest: prefix test functions with efi_st_

Browse Source 
An upcoming patch set creates a global function flush(). To make debugging
easier we should not use the same name for a static function.

Rename static functions in the LoadImage() unit test adding an efi_st_
prefix.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
This commit is contained in:
Heinrich Schuchardt 2022-09-22 15:16:30 +02:00
parent 0e21943b94
commit 0dfc4c84d8
1 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
lib/efi_selftest/efi_selftest_loadimage.c
View File

@ -142,38 +142,39 @@ static struct efi_file_system_info *file_system_info =
&priv_file_system_info.info; &priv_file_system_info.info;
/* Forward definitions of file and file system functions */ /* Forward definitions of file and file system functions */
static efi_status_t EFIAPI open_volume static efi_status_t EFIAPI efi_st_open_volume
(struct efi_simple_file_system_protocol *this, (struct efi_simple_file_system_protocol *this,
struct efi_file_handle **root); struct efi_file_handle **root);
static efi_status_t EFIAPI open static efi_status_t EFIAPI efi_st_open
(struct efi_file_handle *this, (struct efi_file_handle *this,
struct efi_file_handle **new_handle, struct efi_file_handle **new_handle,
u16 *file_name, u64 open_mode, u64 attributes); u16 *file_name, u64 open_mode, u64 attributes);
static efi_status_t EFIAPI close(struct efi_file_handle *this); static efi_status_t EFIAPI efi_st_close(struct efi_file_handle *this);
static efi_status_t EFIAPI delete(struct efi_file_handle *this); static efi_status_t EFIAPI efi_st_delete(struct efi_file_handle *this);
static efi_status_t EFIAPI read static efi_status_t EFIAPI efi_st_read
(struct efi_file_handle *this, efi_uintn_t *buffer_size, void *buffer); (struct efi_file_handle *this, efi_uintn_t *buffer_size, void *buffer);
static efi_status_t EFIAPI write static efi_status_t EFIAPI efi_st_write
(struct efi_file_handle *this, efi_uintn_t *buffer_size, void *buffer); (struct efi_file_handle *this, efi_uintn_t *buffer_size, void *buffer);
static efi_status_t EFIAPI getpos(struct efi_file_handle *this, u64 *pos); static efi_status_t EFIAPI efi_st_getpos(struct efi_file_handle *this,
u64 *pos);
static efi_status_t EFIAPI setpos(struct efi_file_handle *this, u64 pos); static efi_status_t EFIAPI efi_st_setpos(struct efi_file_handle *this, u64 pos);
static efi_status_t EFIAPI getinfo static efi_status_t EFIAPI efi_st_getinfo
(struct efi_file_handle *this, const efi_guid_t *info_type, (struct efi_file_handle *this, const efi_guid_t *info_type,
efi_uintn_t *buffer_size, void *buffer); efi_uintn_t *buffer_size, void *buffer);
static efi_status_t EFIAPI setinfo static efi_status_t EFIAPI efi_st_setinfo
(struct efi_file_handle *this, const efi_guid_t *info_type, (struct efi_file_handle *this, const efi_guid_t *info_type,
efi_uintn_t buffer_size, void *buffer); efi_uintn_t buffer_size, void *buffer);
static efi_status_t EFIAPI flush(struct efi_file_handle *this); static efi_status_t EFIAPI efi_st_flush(struct efi_file_handle *this);
/* Internal information about status of file system */ /* Internal information about status of file system */
static struct { static struct {
@ -190,40 +191,40 @@ static struct {
/* EFI_FILE_PROTOCOL for file */ /* EFI_FILE_PROTOCOL for file */
static struct efi_file_handle file = { static struct efi_file_handle file = {
.rev = 0x00010000, .rev = 0x00010000,
.open = open, .open = efi_st_open,
.close = close, .close = efi_st_close,
.delete = delete, .delete = efi_st_delete,
.read = read, .read = efi_st_read,
.write = write, .write = efi_st_write,
.getpos = getpos, .getpos = efi_st_getpos,
.setpos = setpos, .setpos = efi_st_setpos,
.getinfo = getinfo, .getinfo = efi_st_getinfo,
.setinfo = setinfo, .setinfo = efi_st_setinfo,
.flush = flush, .flush = efi_st_flush,
}; };
/* EFI_FILE_PROTOCOL for root directory */ /* EFI_FILE_PROTOCOL for root directory */
static struct efi_file_handle volume = { static struct efi_file_handle volume = {
.rev = 0x00010000, .rev = 0x00010000,
.open = open, .open = efi_st_open,
.close = close, .close = efi_st_close,
.delete = delete, .delete = efi_st_delete,
.read = read, .read = efi_st_read,
.write = write, .write = efi_st_write,
.getpos = getpos, .getpos = efi_st_getpos,
.setpos = setpos, .setpos = efi_st_setpos,
.getinfo = getinfo, .getinfo = efi_st_getinfo,
.setinfo = setinfo, .setinfo = efi_st_setinfo,
.flush = flush, .flush = efi_st_flush,
}; };
/* EFI_SIMPLE_FILE_SYSTEM_PROTOCOL of the block device */ /* EFI_SIMPLE_FILE_SYSTEM_PROTOCOL of the block device */
struct efi_simple_file_system_protocol file_system = { struct efi_simple_file_system_protocol file_system = {
.rev = 0x00010000, .rev = 0x00010000,
.open_volume = open_volume, .open_volume = efi_st_open_volume,
}; };
static efi_status_t EFIAPI open_volume static efi_status_t EFIAPI efi_st_open_volume
(struct efi_simple_file_system_protocol *this, (struct efi_simple_file_system_protocol *this,
struct efi_file_handle **root) struct efi_file_handle **root)
{ {
@ -236,7 +237,7 @@ static efi_status_t EFIAPI open_volume
return EFI_SUCCESS; return EFI_SUCCESS;
} }
static efi_status_t EFIAPI open static efi_status_t EFIAPI efi_st_open
(struct efi_file_handle *this, (struct efi_file_handle *this,
struct efi_file_handle **new_handle, struct efi_file_handle **new_handle,
u16 *file_name, u64 open_mode, u64 attributes) u16 *file_name, u64 open_mode, u64 attributes)
@ -251,7 +252,7 @@ static efi_status_t EFIAPI open
return EFI_SUCCESS; return EFI_SUCCESS;
} }
static efi_status_t EFIAPI close(struct efi_file_handle *this) static efi_status_t EFIAPI efi_st_close(struct efi_file_handle *this)
{ {
if (this == &file) if (this == &file)
priv.file_open_count--; priv.file_open_count--;
@ -263,7 +264,7 @@ static efi_status_t EFIAPI close(struct efi_file_handle *this)
return EFI_SUCCESS; return EFI_SUCCESS;
} }
static efi_status_t EFIAPI delete(struct efi_file_handle *this) static efi_status_t EFIAPI efi_st_delete(struct efi_file_handle *this)
{ {
if (this != &file) if (this != &file)
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
@ -271,7 +272,7 @@ static efi_status_t EFIAPI delete(struct efi_file_handle *this)
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
static efi_status_t EFIAPI read static efi_status_t EFIAPI efi_st_read
(struct efi_file_handle *this, efi_uintn_t *buffer_size, void *buffer) (struct efi_file_handle *this, efi_uintn_t *buffer_size, void *buffer)
{ {
if (this != &file) if (this != &file)
@ -288,7 +289,7 @@ static efi_status_t EFIAPI read
return EFI_SUCCESS; return EFI_SUCCESS;
} }
static efi_status_t EFIAPI write static efi_status_t EFIAPI efi_st_write
(struct efi_file_handle *this, efi_uintn_t *buffer_size, void *buffer) (struct efi_file_handle *this, efi_uintn_t *buffer_size, void *buffer)
{ {
if (this != &file) if (this != &file)
@ -297,7 +298,7 @@ static efi_status_t EFIAPI write
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
static efi_status_t EFIAPI getpos(struct efi_file_handle *this, u64 *pos) static efi_status_t EFIAPI efi_st_getpos(struct efi_file_handle *this, u64 *pos)
{ {
if (this != &file) if (this != &file)
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
@ -307,7 +308,7 @@ static efi_status_t EFIAPI getpos(struct efi_file_handle *this, u64 *pos)
return EFI_SUCCESS; return EFI_SUCCESS;
} }
static efi_status_t EFIAPI setpos(struct efi_file_handle *this, u64 pos) static efi_status_t EFIAPI efi_st_setpos(struct efi_file_handle *this, u64 pos)
{ {
if (this != &file) if (this != &file)
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
@ -317,7 +318,7 @@ static efi_status_t EFIAPI setpos(struct efi_file_handle *this, u64 pos)
return EFI_SUCCESS; return EFI_SUCCESS;
} }
static efi_status_t EFIAPI getinfo static efi_status_t EFIAPI efi_st_getinfo
(struct efi_file_handle *this, const efi_guid_t *info_type, (struct efi_file_handle *this, const efi_guid_t *info_type,
efi_uintn_t *buffer_size, void *buffer) efi_uintn_t *buffer_size, void *buffer)
{ {
@ -348,7 +349,7 @@ static efi_status_t EFIAPI getinfo
return EFI_SUCCESS; return EFI_SUCCESS;
} }
static efi_status_t EFIAPI setinfo static efi_status_t EFIAPI efi_st_setinfo
(struct efi_file_handle *this, const efi_guid_t *info_type, (struct efi_file_handle *this, const efi_guid_t *info_type,
efi_uintn_t buffer_size, void *buffer) efi_uintn_t buffer_size, void *buffer)
{ {
@ -358,7 +359,7 @@ static efi_status_t EFIAPI setinfo
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
static efi_status_t EFIAPI flush(struct efi_file_handle *this) static efi_status_t EFIAPI efi_st_flush(struct efi_file_handle *this)
{ {
if (this != &file) if (this != &file)
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;