git: 0b72d2965d68 - main - crt_malloc: use uintptr_t instead of long for arithmetic on addresses

[Konstantin Belousov]

The branch main has been updated by kib:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=0b72d2965d68113bce16f6cccea77257283ef0a7

commit 0b72d2965d68113bce16f6cccea77257283ef0a7
Author:     Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2021-10-12 21:39:07 +0000
Commit:     Konstantin Belousov <k...@freebsd.org>
CommitDate: 2021-10-12 23:37:09 +0000

    crt_malloc: use uintptr_t instead of long for arithmetic on addresses
    
    and avoid unneeded casts
    
    Reviewed by:    arichardson (previous version)
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Differential revision:  https://reviews.freebsd.org/D32474
---
 libexec/rtld-elf/rtld_malloc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c
index 6604aa7201f8..f22c3c727c73 100644
--- a/libexec/rtld-elf/rtld_malloc.c
+++ b/libexec/rtld-elf/rtld_malloc.c
@@ -259,7 +259,7 @@ morepages(int n)
        int offset;
 
        if (pagepool_end - pagepool_start > pagesz) {
-               addr = (caddr_t)roundup2((long)pagepool_start, pagesz);
+               addr = roundup2(pagepool_start, pagesz);
                if (munmap(addr, pagepool_end - addr) != 0) {
 #ifdef IN_RTLD
                        rtld_fdprintf(STDERR_FILENO, _BASENAME_RTLD ": "
@@ -269,8 +269,8 @@ morepages(int n)
                }
        }
 
-       offset = (long)pagepool_start - rounddown2((long)pagepool_start,
-           pagesz);
+       offset = (uintptr_t)pagepool_start - rounddown2(
+           (uintptr_t)pagepool_start, pagesz);
 
        pagepool_start = mmap(0, n * pagesz, PROT_READ | PROT_WRITE,
            MAP_ANON | MAP_PRIVATE, -1, 0);