From owner-svn-src-head@FreeBSD.ORG  Mon Mar 12 11:22:24 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 00467106566B;
	Mon, 12 Mar 2012 11:22:23 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E3F1B8FC14;
	Mon, 12 Mar 2012 11:22:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2CBMNcK059451;
	Mon, 12 Mar 2012 11:22:23 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2CBMNIS059449;
	Mon, 12 Mar 2012 11:22:23 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201203121122.q2CBMNIS059449@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 12 Mar 2012 11:22:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232859 - head/libexec/rtld-elf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Mar 2012 11:22:24 -0000

Author: dim
Date: Mon Mar 12 11:22:23 2012
New Revision: 232859
URL: http://svn.freebsd.org/changeset/base/232859

Log:
  Amend r232857, now dropping the casts entirely, as they were not
  necessary at all.
  
  Submitted by:	stefanf

Modified:
  head/libexec/rtld-elf/rtld.c

Modified: head/libexec/rtld-elf/rtld.c
==============================================================================
--- head/libexec/rtld-elf/rtld.c	Mon Mar 12 11:15:44 2012	(r232858)
+++ head/libexec/rtld-elf/rtld.c	Mon Mar 12 11:22:23 2012	(r232859)
@@ -1895,7 +1895,7 @@ preinit_main(void)
     int index;
 
     preinit_addr = (Elf_Addr *)obj_main->preinit_array;
-    if (preinit_addr == (Elf_Addr *)NULL)
+    if (preinit_addr == NULL)
 	return;
 
     for (index = 0; index < obj_main->preinit_array_num; index++) {
@@ -2036,7 +2036,7 @@ objlist_call_init(Objlist *list, RtldLoc
 	    call_initfini_pointer(elm->obj, elm->obj->init);
 	}
 	init_addr = (Elf_Addr *)elm->obj->init_array;
-	if (init_addr != (Elf_Addr *)NULL) {
+	if (init_addr != NULL) {
 	    for (index = 0; index < elm->obj->init_array_num; index++) {
 		if (init_addr[index] != 0 && init_addr[index] != 1) {
 		    dbg("calling init function for %s at %p", elm->obj->path,