aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libefivar/efivar.c6
-rw-r--r--lib/libefivar/efivar.h35
-rw-r--r--usr.sbin/efivar/efivar.c2
3 files changed, 5 insertions, 38 deletions
diff --git a/lib/libefivar/efivar.c b/lib/libefivar/efivar.c
index 4e02eb80caef..a825d9e9f9bf 100644
--- a/lib/libefivar/efivar.c
+++ b/lib/libefivar/efivar.c
@@ -150,7 +150,7 @@ efi_append_variable(efi_guid_t guid, const char *name,
{
return efi_set_variable(guid, name, data, data_size,
- attributes | EFI_VARIABLE_APPEND_WRITE, 0);
+ attributes | EFI_VARIABLE_APPEND_WRITE);
}
int
@@ -158,7 +158,7 @@ efi_del_variable(efi_guid_t guid, const char *name)
{
/* data_size of 0 deletes the variable */
- return efi_set_variable(guid, name, NULL, 0, 0, 0);
+ return efi_set_variable(guid, name, NULL, 0, 0);
}
int
@@ -358,7 +358,7 @@ efi_name_to_guid(const char *name, efi_guid_t *guid)
int
efi_set_variable(efi_guid_t guid, const char *name,
- uint8_t *data, size_t data_size, uint32_t attributes, mode_t mode __unused)
+ uint8_t *data, size_t data_size, uint32_t attributes)
{
struct efi_var_ioc var;
int rv;
diff --git a/lib/libefivar/efivar.h b/lib/libefivar/efivar.h
index cba8a8e61849..5725bb029d7c 100644
--- a/lib/libefivar/efivar.h
+++ b/lib/libefivar/efivar.h
@@ -83,7 +83,7 @@ int efi_guid_to_symbol(efi_guid_t *guid, char **symbol);
int efi_guid_to_str(const efi_guid_t *guid, char **sp);
int efi_name_to_guid(const char *name, efi_guid_t *guid);
int efi_set_variable(efi_guid_t guid, const char *name,
- uint8_t *data, size_t data_size, uint32_t attributes, mode_t mode);
+ uint8_t *data, size_t data_size, uint32_t attributes);
int efi_str_to_guid(const char *s, efi_guid_t *guid);
int efi_variables_supported(void);
@@ -99,37 +99,4 @@ int efi_known_guid(struct uuid_table **);
extern const efi_guid_t efi_guid_empty;
-/* Stubs that are expected, but aren't really used */
-static inline int
-efi_error_get(unsigned int n __unused, char ** const fn __unused,
- char ** const func __unused, int *line __unused,
- char ** const msg __unused, int *err __unused)
-{
- return 0;
-}
-
-static inline int
-efi_error_set(const char *fn __unused, const char *func __unused,
- int line __unused, int err __unused, const char *fmt __unused, ...)
-{
- return 0;
-}
-
-static inline void
-efi_error_clear(void)
-{
-}
-
-static inline int
-efi_error(const char *fmt __unused, ...)
-{
- return 0;
-}
-
-static inline int
-efi_error_val(int val __unused, const char *fmt __unused, ...)
-{
- return 0;
-}
-
#endif /* _EFIVAR_H_ */
diff --git a/usr.sbin/efivar/efivar.c b/usr.sbin/efivar/efivar.c
index d156f78f1851..25eb8415b5a5 100644
--- a/usr.sbin/efivar/efivar.c
+++ b/usr.sbin/efivar/efivar.c
@@ -147,7 +147,7 @@ write_variable(char *name, char *val)
breakdown_name(name, &guid, &vname);
data = get_value(val, &datalen);
- if (efi_set_variable(guid, vname, data, datalen, attrib, 0) < 0)
+ if (efi_set_variable(guid, vname, data, datalen, attrib) < 0)
err(1, "efi_set_variable");
}