From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1NVkmY-0007T0-B4 for garchives@archives.gentoo.org; Fri, 15 Jan 2010 11:56:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6BB09E0539; Fri, 15 Jan 2010 11:55:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2644CE0539 for ; Fri, 15 Jan 2010 11:55:59 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id AB81C1B400E for ; Fri, 15 Jan 2010 11:55:58 +0000 (UTC) Received: from vapier by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1NVkmT-0001FP-9C for gentoo-commits@lists.gentoo.org; Fri, 15 Jan 2010 11:55:57 +0000 From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-projects commit in pax-utils: paxelf.c paxelf.h X-VCS-Repository: gentoo-projects X-VCS-Files: paxelf.c paxelf.h X-VCS-Directories: pax-utils X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: Sender: Mike Frysinger Date: Fri, 15 Jan 2010 11:55:57 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: eacf5e23-8d33-45b7-9208-a8aa15d421e5 X-Archives-Hash: 2ff3d34378fda682e09b79577d096ba7 vapier 10/01/15 11:55:57 Modified: paxelf.c paxelf.h Log: unify elf->{ehdr,data} storage with a union Revision Changes Path 1.69 pax-utils/paxelf.c file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/pax= elf.c?rev=3D1.69&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/pax= elf.c?rev=3D1.69&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/pax= elf.c?r1=3D1.68&r2=3D1.69 Index: paxelf.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- paxelf.c 15 Jan 2010 11:06:33 -0000 1.68 +++ paxelf.c 15 Jan 2010 11:55:56 -0000 1.69 @@ -1,7 +1,7 @@ /* * Copyright 2003-2007 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v 1.68 2010/= 01/15 11:06:33 vapier Exp $ + * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v 1.69 2010/= 01/15 11:55:56 vapier Exp $ * * Copyright 2005-2007 Ned Ludd - * Copyright 2005-2007 Mike Frysinger - @@ -502,7 +502,6 @@ elf->base_filename =3D elf->base_filename + 1; elf->elf_class =3D elf->data[EI_CLASS]; do_reverse_endian =3D (ELF_DATA !=3D elf->data[EI_DATA]); - elf->ehdr =3D elf->vdata; =20 #define READELF_HEADER(B) \ if (elf->elf_class =3D=3D ELFCLASS ## B) { \ 1.55 pax-utils/paxelf.h file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/pax= elf.h?rev=3D1.55&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/pax= elf.h?rev=3D1.55&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/pax= elf.h?r1=3D1.54&r2=3D1.55 Index: paxelf.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-projects/pax-utils/paxelf.h,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- paxelf.h 15 Jan 2010 11:06:33 -0000 1.54 +++ paxelf.h 15 Jan 2010 11:55:56 -0000 1.55 @@ -1,7 +1,7 @@ /* * Copyright 2005-2007 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.h,v 1.54 2010/= 01/15 11:06:33 vapier Exp $ + * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.h,v 1.55 2010/= 01/15 11:55:56 vapier Exp $ * * Copyright 2005-2007 Ned Ludd - * Copyright 2005-2007 Mike Frysinger - @@ -13,10 +13,9 @@ #define _PAX_ELF_H =20 typedef struct { - void *ehdr; void *phdr; void *shdr; - union { void *vdata; char *data; }; + union { void *ehdr, *vdata; char *data; }; void *data_end; char elf_class; off_t len;