sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-22 21:11:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

[settings] Explicitly separate the concept of a completed fetched setting

Browse Source 
The fetch_setting() family of functions may currently modify the
definition of the specified setting (e.g. to add missing type
information).  Clean up this interface by requiring callers to provide
an explicit buffer to contain the completed definition of the fetched
setting, if required.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2013-12-03 16:48:56 +00:00
parent a2638a8edd
commit 22001cb206
37 changed files with 620 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/interface/efi/efi_snp_hii.c
View File

@@ -276,7 +276,9 @@ static int efi_snp_hii_fetch ( struct efi_snp_device *snpdev,
const char *key, const char *value,
wchar_t **results, int *have_setting ) {
struct settings *settings = efi_snp_hii_settings ( snpdev );
struct settings *origin;
struct setting *setting;
struct setting fetched;
int len;
char *buf;
char *encoded;
@@ -311,7 +313,8 @@ static int efi_snp_hii_fetch ( struct efi_snp_device *snpdev,
if ( setting_exists ( settings, setting ) ) {
/* Calculate formatted length */
len = fetchf_setting ( settings, setting, NULL, 0 );
len = fetchf_setting ( settings, setting, &origin, &fetched,
NULL, 0 );
if ( len < 0 ) {
rc = len;
DBGC ( snpdev, "SNPDEV %p could not fetch %s: %s\n",
@@ -328,7 +331,8 @@ static int efi_snp_hii_fetch ( struct efi_snp_device *snpdev,
encoded = ( buf + len + 1 /* NUL */ );
/* Format value */
fetchf_setting ( settings, setting, buf, ( len + 1 /* NUL */ ));
fetchf_setting ( origin, &fetched, NULL, NULL, buf,
( len + 1 /* NUL */ ) );
for ( i = 0 ; i < len ; i++ ) {
sprintf ( ( encoded + ( 4 * i ) ), "%04x",
*( ( uint8_t * ) buf + i ) );

8
src/interface/smbios/smbios_settings.c
View File

@@ -28,7 +28,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <ipxe/smbios.h>
/** SMBIOS settings scope */
static struct settings_scope smbios_settings_scope;
static const struct settings_scope smbios_settings_scope;
/**
* Construct SMBIOS raw-data tag
@@ -63,7 +63,7 @@ static struct settings_scope smbios_settings_scope;
* @ret applies Setting applies within this settings block
*/
static int smbios_applies ( struct settings *settings __unused,
struct setting *setting ) {
const struct setting *setting ) {
return ( setting->scope == &smbios_settings_scope );
}
@@ -188,7 +188,7 @@ struct init_fn smbios_init_fn __init_fn ( INIT_NORMAL ) = {
};
/** UUID setting obtained via SMBIOS */
struct setting uuid_setting __setting ( SETTING_HOST ) = {
const struct setting uuid_setting __setting ( SETTING_HOST ) = {
.name = "uuid",
.description = "UUID",
.tag = SMBIOS_RAW_TAG ( SMBIOS_TYPE_SYSTEM_INFORMATION,
@@ -198,7 +198,7 @@ struct setting uuid_setting __setting ( SETTING_HOST ) = {
};
/** Other SMBIOS predefined settings */
struct setting smbios_predefined_settings[] __setting ( SETTING_HOST_EXTRA ) = {
const struct setting smbios_predefined_settings[] __setting ( SETTING_HOST_EXTRA ) = {
{
.name = "manufacturer",
.description = "Manufacturer",