Sun Mar 15 23:53:04 2009 UTC ()
rename a variable to avoid a compiler warning


(lukem)
diff -r1.32 -r1.33 src/libexec/ld.elf_so/arch/x86_64/mdreloc.c

cvs diff -r1.32 -r1.33 src/libexec/ld.elf_so/arch/x86_64/mdreloc.c (expand / switch to context diff)
--- src/libexec/ld.elf_so/arch/x86_64/mdreloc.c 2008/07/24 04:39:26 1.32
+++ src/libexec/ld.elf_so/arch/x86_64/mdreloc.c 2009/03/15 23:53:03 1.33
@@ -1,4 +1,4 @@
-/*	$NetBSD: mdreloc.c,v 1.32 2008/07/24 04:39:26 matt Exp $	*/
+/*	$NetBSD: mdreloc.c,v 1.33 2009/03/15 23:53:03 lukem Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -68,12 +68,11 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.32 2008/07/24 04:39:26 matt Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.33 2009/03/15 23:53:03 lukem Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/mman.h>
-#include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
@@ -284,12 +283,12 @@
 {
 	const Elf_Rela *rela = obj->pltrela + reloff;
 	Elf_Addr new_value;
-	int err;
+	int error;
 
 	new_value = 0; /* XXX GCC4 */
 
-	err = _rtld_relocate_plt_object(obj, rela, &new_value);
-	if (err || new_value == 0)
+	error = _rtld_relocate_plt_object(obj, rela, &new_value);
+	if (error || new_value == 0)
 		_rtld_die();
 
 	return (caddr_t)new_value;