summaryrefslogtreecommitdiff
path: root/sys/lib
diff options
context:
space:
mode:
authormaxv <maxv@NetBSD.org>2017-10-13 10:04:27 +0000
committermaxv <maxv@NetBSD.org>2017-10-13 10:04:27 +0000
commit89ee7cd75b7fd1b5ae952915eb2c4d8f5ca2bc90 (patch)
tree679fa70c2e4b4808bfc9ff04353e80420ee3af9a /sys/lib
parent844bb58e625745b67bba4e0f6957232c68a3c80b (diff)
Constify offset, it must not change.
Diffstat (limited to 'sys/lib')
-rw-r--r--sys/lib/libsa/loadfile_elf32.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/lib/libsa/loadfile_elf32.c b/sys/lib/libsa/loadfile_elf32.c
index b0302e1e868..5ed1c6dc192 100644
--- a/sys/lib/libsa/loadfile_elf32.c
+++ b/sys/lib/libsa/loadfile_elf32.c
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_elf32.c,v 1.45 2017/10/08 13:51:31 maxv Exp $ */
+/* $NetBSD: loadfile_elf32.c,v 1.46 2017/10/13 10:04:27 maxv Exp $ */
/*
* Copyright (c) 1997, 2008, 2017 The NetBSD Foundation, Inc.
@@ -283,13 +283,13 @@ externalize_shdr(Elf_Byte bo, Elf_Shdr *shdr)
static int
ELFNAMEEND(loadfile_dynamic)(int fd, Elf_Ehdr *elf, u_long *marks, int flags)
{
+ const u_long offset = 0;
Elf_Shdr *shdr;
Elf_Addr shpp, addr;
int i, j, loaded;
size_t size;
ssize_t sz, nr;
Elf_Addr maxp, elfp = 0;
- u_long offset = 0;
/* some ports dont use the offset */
(void)&offset;
@@ -463,13 +463,13 @@ static int
ELFNAMEEND(loadsym)(int fd, Elf_Ehdr *elf, Elf_Addr maxp, Elf_Addr elfp,
u_long *marks, int flags, Elf_Addr *nmaxp)
{
+ const u_long offset = marks[MARK_START];
int boot_load_ctf = 1;
Elf_Shdr *shp;
Elf_Addr shpp;
char *shstr = NULL;
ssize_t nr, sz;
size_t i, j, shstrsz = 0;
- u_long offset = marks[MARK_START];
struct __packed {
Elf_Nhdr nh;
uint8_t name[ELF_NOTE_NETBSD_NAMESZ + 1];
@@ -679,11 +679,11 @@ out:
static int
ELFNAMEEND(loadfile_static)(int fd, Elf_Ehdr *elf, u_long *marks, int flags)
{
+ const u_long offset = marks[MARK_START];
Elf_Phdr *phdr;
int i, first;
ssize_t sz;
Elf_Addr minp = ~0, maxp = 0, pos = 0, elfp = 0;
- u_long offset = marks[MARK_START];
ssize_t nr;
/* some ports dont use the offset */