Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/systemd/patches/systemd-242-random-util-rename-err-to-success.patch

    Contents of /trunk/systemd/patches/systemd-242-random-util-rename-err-to-success.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3368 - (show annotations) (download)
    Tue Jul 9 11:20:22 2019 UTC (4 years, 9 months ago) by niro
    File size: 1255 byte(s) 
    -added systemd-242 upstream patches
    1 From 328f850e36e86d14ab06d11fa8f2397e9575a7f9 Mon Sep 17 00:00:00 2001
    2 From: Lennart Poettering <lennart@poettering.net>
    3 Date: Tue, 7 May 2019 18:51:26 -0400
    4 Subject: [PATCH] random-util: rename "err" to "success"
    5
    6 After all rdrand returns 1 on success, and 0 on failure, hence let's
    7 name this accordingly.
    8 ---
    9 src/basic/random-util.c | 8 ++++----
    10 1 file changed, 4 insertions(+), 4 deletions(-)
    11
    12 diff --git a/src/basic/random-util.c b/src/basic/random-util.c
    13 index 40f1928936f..7c648575927 100644
    14 --- a/src/basic/random-util.c
    15 +++ b/src/basic/random-util.c
    16 @@ -35,7 +35,7 @@ int rdrand(unsigned long *ret) {
    17
    18 #if defined(__i386__) || defined(__x86_64__)
    19 static int have_rdrand = -1;
    20 - unsigned char err;
    21 + uint8_t success;
    22
    23 if (have_rdrand < 0) {
    24 uint32_t eax, ebx, ecx, edx;
    25 @@ -60,9 +60,9 @@ int rdrand(unsigned long *ret) {
    26 asm volatile("rdrand %0;"
    27 "setc %1"
    28 : "=r" (*ret),
    29 - "=qm" (err));
    30 - msan_unpoison(&err, sizeof(err));
    31 - if (!err)
    32 + "=qm" (success));
    33 + msan_unpoison(&success, sizeof(sucess));
    34 + if (!success)
    35 return -EAGAIN;
    36
    37 return 0;