From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 9 Mar 2015 19:55:24 +0000 (-0400)
Subject: efivars: rename last remaining err to r
X-Git-Tag: v219.0~431
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a8436474fa5fa02b8ecf3c23be04de2bca8b4c03;p=elogind.git

efivars: rename last remaining err to r
---

diff --git a/src/shared/efivars.c b/src/shared/efivars.c
index 40c4270f5..2599a1aba 100644
--- a/src/shared/efivars.c
+++ b/src/shared/efivars.c
@@ -261,12 +261,12 @@ int efi_get_boot_option(
         size_t title_size;
         _cleanup_free_ char *s = NULL, *p = NULL;
         sd_id128_t p_uuid = SD_ID128_NULL;
-        int err;
+        int r;
 
         xsprintf(boot_id, "Boot%04X", id);
-        err = efi_get_variable(EFI_VENDOR_GLOBAL, boot_id, NULL, (void **)&buf, &l);
-        if (err < 0)
-                return err;
+        r = efi_get_variable(EFI_VENDOR_GLOBAL, boot_id, NULL, (void **)&buf, &l);
+        if (r < 0)
+                return r;
         if (l < sizeof(struct boot_option))
                 return -ENOENT;