X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fboot%2Fboot-efi.c;h=bd0c59bd5aef936d95507eff0b77c7d6acc31c47;hp=33840b6864e83820be915dca43e6f9384988c2e5;hb=f27e2d8c0c0c18d5a1be62c87ea89fcd4894fffa;hpb=c51d84dc09476d9c06b8aac726220bf3c7d62e8d

diff --git a/src/boot/boot-efi.c b/src/boot/boot-efi.c
index 33840b686..bd0c59bd5 100644
--- a/src/boot/boot-efi.c
+++ b/src/boot/boot-efi.c
@@ -50,7 +50,7 @@ static char *tilt_slashes(char *s) {
 }
 
 static int get_boot_entries(struct boot_info *info) {
-        uint16_t *list;
+        uint16_t *list = NULL;
         int i, n;
         int err = 0;
 
@@ -69,7 +69,7 @@ static int get_boot_entries(struct boot_info *info) {
                 info->fw_entries = e;
 
                 e = &info->fw_entries[info->fw_entries_count];
-                memset(e, 0, sizeof(struct boot_info_entry));
+                memzero(e, sizeof(struct boot_info_entry));
                 e->order = -1;
 
                 err = efi_get_boot_option(list[i], &e->title, &e->part_uuid, &e->path);
@@ -95,7 +95,7 @@ static int find_active_entry(struct boot_info *info) {
         void *buf;
         size_t l;
         size_t i;
-        int err = -ENOENT;
+        int err;
 
         err = efi_get_variable(EFI_VENDOR_GLOBAL, "BootCurrent", NULL, &buf, &l);
         if (err < 0)