summaryrefslogtreecommitdiff
path: root/usr/src/uts/intel/amd64/krtld/kobj_reloc.c
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2019-12-30 15:05:56 +0200
committerToomas Soome <tsoome@me.com>2020-03-16 08:57:02 +0200
commit584b574a3b16c6772c8204ec1d1c957c56f22a87 (patch)
treec9bfd155a2c2edf14608a4ee0d1b328680cde6d8 /usr/src/uts/intel/amd64/krtld/kobj_reloc.c
parent34a4e6b53d2e6f2605fd77cda5b161201d7d0f20 (diff)
downloadillumos-joyent-584b574a3b16c6772c8204ec1d1c957c56f22a87.tar.gz
12174 i86pc: variable may be used uninitialized
Reviewed by: John Levon <john.levon@joyent.com> Reviewed by: Andrew Stormont <astormont@racktopsystems.com> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/uts/intel/amd64/krtld/kobj_reloc.c')
-rw-r--r--usr/src/uts/intel/amd64/krtld/kobj_reloc.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/usr/src/uts/intel/amd64/krtld/kobj_reloc.c b/usr/src/uts/intel/amd64/krtld/kobj_reloc.c
index 56c8087baa..401f13a33a 100644
--- a/usr/src/uts/intel/amd64/krtld/kobj_reloc.c
+++ b/usr/src/uts/intel/amd64/krtld/kobj_reloc.c
@@ -24,8 +24,6 @@
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* x86 relocation code.
*/
@@ -120,9 +118,8 @@ sdt_reloc_resolve(struct module *mp, char *symname, uint8_t *instr)
}
int
-/* ARGSUSED2 */
-do_relocate(struct module *mp, char *reltbl, Word relshtype, int nreloc,
- int relocsize, Addr baseaddr)
+do_relocate(struct module *mp, char *reltbl, int nreloc, int relocsize,
+ Addr baseaddr)
{
unsigned long stndx;
unsigned long off; /* can't be register for tnf_reloc_resolve() */
@@ -130,7 +127,7 @@ do_relocate(struct module *mp, char *reltbl, Word relshtype, int nreloc,
register unsigned int rtype;
unsigned long value;
Elf64_Sxword addend;
- Sym *symref;
+ Sym *symref = NULL;
int err = 0;
tnf_probe_control_t *probelist = NULL;
tnf_tag_data_t *taglist = NULL;
@@ -326,8 +323,8 @@ do_relocations(struct module *mp)
}
#endif
- if (do_relocate(mp, (char *)rshp->sh_addr, rshp->sh_type,
- nreloc, rshp->sh_entsize, shp->sh_addr) < 0) {
+ if (do_relocate(mp, (char *)rshp->sh_addr, nreloc,
+ rshp->sh_entsize, shp->sh_addr) < 0) {
_kobj_printf(ops,
"do_relocations: %s do_relocate failed\n",
mp->filename);