From 586453fee2c4e94411d77036a8ab9d6b9a42f1a0 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Fri, 24 Dec 1999 15:33:36 +0000
Subject: [PATCH] Fixed a cast of a pointer to an integer of a possibly
 different size. Fixed casts of non-`void *' pointers to uintptr_t.  Fixed
 related style bugs.  This file uses perfectly non-KNF formatting for casts.

---
 sys/kern/link_aout.c    | 4 ++--
 sys/kern/link_elf.c     | 6 +++---
 sys/kern/link_elf_obj.c | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/kern/link_aout.c b/sys/kern/link_aout.c
index 6081a9c1120..de5518de13f 100644
--- a/sys/kern/link_aout.c
+++ b/sys/kern/link_aout.c
@@ -563,17 +563,17 @@ link_aout_search_symbol(linker_file_t lf, caddr_t value,
 	aout_file_t af = lf->priv;
 	u_long off = (uintptr_t) (void *) value;
 	u_long diff = off;
+	u_long sp_nz_value;
 	struct nzlist* sp;
 	struct nzlist* ep;
 	struct nzlist* best = 0;
-	u_long sp_nz_value;
 
 	for (sp = AOUT_RELOC(af, struct nzlist, LD_SYMBOL(af->dynamic)),
 		 ep = (struct nzlist *) ((caddr_t) sp + LD_STABSZ(af->dynamic));
 	     sp < ep; sp++) {
 		if (sp->nz_name == 0)
 			continue;
-		sp_nz_value = sp->nz_value + (u_long)af->address;
+		sp_nz_value = sp->nz_value + (uintptr_t) (void *) af->address;
 		if (off >= sp_nz_value) {
 			if (off - sp_nz_value < diff) {
 				diff = off - sp_nz_value;
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index 0fefb50f506..daf3b307270 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -953,17 +953,17 @@ link_elf_search_symbol(linker_file_t lf, caddr_t value,
 		       c_linker_sym_t* sym, long* diffp)
 {
 	elf_file_t ef = lf->priv;
-	u_long off = (uintptr_t) value;
+	u_long off = (uintptr_t) (void *) value;
 	u_long diff = off;
+	u_long st_value;
 	const Elf_Sym* es;
 	const Elf_Sym* best = 0;
 	int i;
-	u_long st_value;
 
 	for (i = 0, es = ef->ddbsymtab; i < ef->ddbsymcnt; i++, es++) {
 		if (es->st_name == 0)
 			continue;
-		st_value = es->st_value + (u_long)ef->address;
+		st_value = es->st_value + (uintptr_t) (void *) ef->address;
 		if (off >= st_value) {
 			if (off - st_value < diff) {
 				diff = off - st_value;
diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
index 0fefb50f506..daf3b307270 100644
--- a/sys/kern/link_elf_obj.c
+++ b/sys/kern/link_elf_obj.c
@@ -953,17 +953,17 @@ link_elf_search_symbol(linker_file_t lf, caddr_t value,
 		       c_linker_sym_t* sym, long* diffp)
 {
 	elf_file_t ef = lf->priv;
-	u_long off = (uintptr_t) value;
+	u_long off = (uintptr_t) (void *) value;
 	u_long diff = off;
+	u_long st_value;
 	const Elf_Sym* es;
 	const Elf_Sym* best = 0;
 	int i;
-	u_long st_value;
 
 	for (i = 0, es = ef->ddbsymtab; i < ef->ddbsymcnt; i++, es++) {
 		if (es->st_name == 0)
 			continue;
-		st_value = es->st_value + (u_long)ef->address;
+		st_value = es->st_value + (uintptr_t) (void *) ef->address;
 		if (off >= st_value) {
 			if (off - st_value < diff) {
 				diff = off - st_value;