From e76f11f441aa03e85f97886b2fd6c2228dc119f4 Mon Sep 17 00:00:00 2001 From: Andriy Gapon Date: Thu, 11 Jun 2009 17:05:45 +0000 Subject: [PATCH] strict kobj signatures: linker_if fixes in symtab_get method symtab parameter is made constant as this reflects actual intention and usage of the method Reviewed by: imp, current@ Approved by: jhb (mentor) --- sys/dev/ksyms/ksyms.c | 5 +++-- sys/kern/link_elf_obj.c | 4 ++-- sys/kern/linker_if.m | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/dev/ksyms/ksyms.c b/sys/dev/ksyms/ksyms.c index cb0f9673237..fc368c7dca0 100644 --- a/sys/dev/ksyms/ksyms.c +++ b/sys/dev/ksyms/ksyms.c @@ -129,7 +129,7 @@ static int ksyms_size_permod(linker_file_t lf, void *arg) { struct tsizes *ts; - Elf_Sym *symtab; + const Elf_Sym *symtab; caddr_t strtab; long syms; @@ -170,7 +170,8 @@ static int ksyms_add(linker_file_t lf, void *arg) { struct toffsets *to; - Elf_Sym *symtab, *symp; + const Elf_Sym *symtab; + Elf_Sym *symp; caddr_t strtab; long symsz; size_t strsz, numsyms; diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index 707c580ce25..2adbe19b15a 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -139,7 +139,7 @@ static int link_elf_each_function_nameval(linker_file_t, linker_function_nameval_callback_t, void *); static void link_elf_reloc_local(linker_file_t); -static long link_elf_symtab_get(linker_file_t, Elf_Sym **); +static long link_elf_symtab_get(linker_file_t, const Elf_Sym **); static long link_elf_strtab_get(linker_file_t, caddr_t *); static Elf_Addr elf_obj_lookup(linker_file_t lf, Elf_Size symidx, int deps); @@ -1291,7 +1291,7 @@ link_elf_reloc_local(linker_file_t lf) } static long -link_elf_symtab_get(linker_file_t lf, Elf_Sym **symtab) +link_elf_symtab_get(linker_file_t lf, const Elf_Sym **symtab) { elf_file_t ef = (elf_file_t)lf; diff --git a/sys/kern/linker_if.m b/sys/kern/linker_if.m index 379bc0e9948..3df592c462d 100644 --- a/sys/kern/linker_if.m +++ b/sys/kern/linker_if.m @@ -110,7 +110,7 @@ METHOD int ctf_get { # METHOD long symtab_get { linker_file_t file; - Elf_Sym **symtab; + const Elf_Sym **symtab; }; #