diff options
| author | Michael Brown | 2025-04-20 19:29:48 +0200 |
|---|---|---|
| committer | Michael Brown | 2025-04-21 00:00:13 +0200 |
| commit | 89fe7886897be76ed902317e311d60ae654057aa (patch) | |
| tree | eddd42226c8336226d0a9649d705ccc9f02c88f4 /src/image | |
| parent | [uaccess] Remove redundant userptr_add() and userptr_diff() (diff) | |
| download | ipxe-89fe7886897be76ed902317e311d60ae654057aa.tar.gz ipxe-89fe7886897be76ed902317e311d60ae654057aa.tar.xz ipxe-89fe7886897be76ed902317e311d60ae654057aa.zip | |
[uaccess] Remove redundant memcpy_user() and related string functions
The memcpy_user(), memmove_user(), memcmp_user(), memset_user(), and
strlen_user() functions are now just straightforward wrappers around
the corresponding standard library functions.
Remove these redundant wrappers.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/image')
| -rw-r--r-- | src/image/elf.c | 2 | ||||
| -rw-r--r-- | src/image/segment.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/image/elf.c b/src/image/elf.c index 5c2f9db25..46c9fe8eb 100644 --- a/src/image/elf.c +++ b/src/image/elf.c @@ -66,7 +66,7 @@ static int elf_load_segment ( struct image *image, Elf_Phdr *phdr, } /* Copy image to segment */ - memcpy_user ( buffer, 0, image->data, phdr->p_offset, phdr->p_filesz ); + memcpy ( buffer, ( image->data + phdr->p_offset ), phdr->p_filesz ); return 0; } diff --git a/src/image/segment.c b/src/image/segment.c index 2d0f2f0fc..b7f8ef56c 100644 --- a/src/image/segment.c +++ b/src/image/segment.c @@ -83,7 +83,7 @@ int prep_segment ( userptr_t segment, size_t filesz, size_t memsz ) { if ( ( start >= memmap.regions[i].start ) && ( end <= memmap.regions[i].end ) ) { /* Found valid region: zero bss and return */ - memset_user ( segment, filesz, 0, ( memsz - filesz ) ); + memset ( ( segment + filesz ), 0, ( memsz - filesz ) ); return 0; } } |