From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 19 Dec 2022 10:17:07 +0000 (+0100)
Subject: efi: do not use 'r' as pointer name
X-Git-Tag: v253-rc1~244^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0e475ce6afa963f0943e5772013a2daf8a44eeb;p=thirdparty%2Fsystemd.git

efi: do not use 'r' as pointer name

'r' should only be used as in 'int r'.
---

diff --git a/src/boot/efi/util.h b/src/boot/efi/util.h
index 699f1a2c7cf..cc750d7cca3 100644
--- a/src/boot/efi/util.h
+++ b/src/boot/efi/util.h
@@ -84,12 +84,12 @@ static inline void *xmalloc_multiply(size_t size, size_t n) {
 /* Use malloc attribute as this never returns p like userspace realloc. */
 _malloc_ _alloc_(3) _returns_nonnull_ _warn_unused_result_
 static inline void *xrealloc(void *p, size_t old_size, size_t new_size) {
-        void *r = xmalloc(new_size);
+        void *t = xmalloc(new_size);
         new_size = MIN(old_size, new_size);
         if (new_size > 0)
-                memcpy(r, p, new_size);
+                memcpy(t, p, new_size);
         free(p);
-        return r;
+        return t;
 }
 
 #define xpool_print(fmt, ...) ((char16_t *) ASSERT_SE_PTR(PoolPrint((fmt), ##__VA_ARGS__)))