PERFORCE change 104298 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=104298

Change 104298 by jb at jb_freebsd2 on 2006/08/16 21:04:54

	It seems the caching is being implemented in a different way.
	
	This is like trying to guess lotto numbers.

Affected files ...

.. //depot/projects/dtrace/src/lib/libelf/_libelf.h#5 edit

Differences ...

==== //depot/projects/dtrace/src/lib/libelf/_libelf.h#5 (text+ko) ====

@@ -86,18 +86,6 @@
 	size_t		e_rawsize;	/* size of uninterpreted bytes */
 	unsigned int	e_version;	/* file version */
 
-	/*
-	 * Cached data in host byte order. Pointers are to malloc'ed
-	 * memory and the dimensions of the arrays are in the relevant
-	 * header.
-	 */
-	Elf32_Ehdr	e_eh32;		/* 32-bit ELF header */
-	Elf64_Ehdr	e_eh64;		/* 64-bit ELF header */
-	Elf32_Phdr	*e_ph32;	/* Ptr to the 32-bit program header array */
-	Elf64_Phdr	*e_ph64;	/* Ptr to the 64-bit program header array */
-	Elf32_Shdr	*e_sh32;	/* Ptr to the 32-bit section header array */
-	Elf64_Shdr	*e_sh64;	/* Ptr to the 64-bit section header array */
-
 	union {
 		struct {		/* ar(1) archives */
 			off_t	e_next;
@@ -114,6 +102,14 @@
 				Elf32_Ehdr *e_ehdr32;
 				Elf64_Ehdr *e_ehdr64;
 			} e_ehdr;
+			union {
+				Elf32_Phdr *e_phdr32;
+				Elf64_Phdr *e_phdr64;
+			} e_phdr;
+			union {
+				Elf32_Shdr *e_shdr32;
+				Elf64_Shdr *e_shdr64;
+			} e_shdr;
 		} e_elf;
 	} e_u;
 };