summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-02-13 21:24:10 +0100
committerLennart Poettering <lennart@poettering.net>2013-02-13 21:24:10 +0100
commit61cc634bc208b264bd2fbe6af241b345a2002509 (patch)
tree8f4b649a7e1313a1916793799f261bc934c2a058
parent3ac525bd75f0009954c6dde3461b6a640d936ee3 (diff)
efi: use efi_get_variable_string() instead of efi_get_variable() where we can
-rw-r--r--src/shared/efivars.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/src/shared/efivars.c b/src/shared/efivars.c
index 7918c59613..064746a9a8 100644
--- a/src/shared/efivars.c
+++ b/src/shared/efivars.c
@@ -348,23 +348,17 @@ int efi_get_boot_options(uint16_t **options) {
}
static int read_usec(sd_id128_t vendor, const char *name, usec_t *u) {
- _cleanup_free_ void *i = NULL;
_cleanup_free_ char *j = NULL;
- size_t is;
int r;
uint64_t x;
assert(name);
assert(u);
- r = efi_get_variable(EFI_VENDOR_LOADER, name, NULL, &i, &is);
+ r = efi_get_variable_string(EFI_VENDOR_LOADER, name, &j);
if (r < 0)
return r;
- j = utf16_to_utf8(i, is);
- if (!j)
- return -ENOMEM;
-
r = safe_atou64(j, &x);
if (r < 0)
return r;
@@ -437,22 +431,16 @@ int efi_get_boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, d
}
int efi_get_loader_device_part_uuid(sd_id128_t *u) {
- _cleanup_free_ void *s = NULL;
_cleanup_free_ char *p = NULL;
- size_t ss;
int r, parsed[16];
unsigned i;
assert(u);
- r = efi_get_variable(EFI_VENDOR_LOADER, "LoaderDevicePartUUID", NULL, &s, &ss);
+ r = efi_get_variable_string(EFI_VENDOR_LOADER, "LoaderDevicePartUUID", &p);
if (r < 0)
return r;
- p = utf16_to_utf8(s, ss);
- if (!p)
- return -ENOMEM;
-
if (sscanf(p, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
&parsed[0], &parsed[1], &parsed[2], &parsed[3],
&parsed[4], &parsed[5], &parsed[6], &parsed[7],