PERFORCE change 109158 for review

[John Birrell]

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

Change 109158 by jb at jb_freebsd8 on 2006/11/03 22:44:43

	IFlibbsdelf

Affected files ...

.. //depot/projects/dtrace/src/lib/libelf/elf_scn.c#5 integrate

Differences ...

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

@@ -53,7 +53,7 @@
 	assert(e != NULL);
 	assert(ehdr != NULL);
 
-  #define	CHECK_EHDR(E,EH)	do {			\
+#define	CHECK_EHDR(E,EH)	do {				\
 		if (fsz != (EH)->e_shentsize ||			\
 		    shoff + fsz * shnum > e->e_rawsize) {	\
 			LIBELF_SET_ERROR(HEADER, 0);		\
@@ -225,8 +225,6 @@
 		return (NULL);
 	}
 
-	if (s == NULL)
-		s = STAILQ_FIRST(&e->e_u.e_elf.e_scn);
-
-	return (STAILQ_NEXT(s, s_next));
+	return (s == NULL ? elf_getscn(e, (size_t) 1) :
+	    STAILQ_NEXT(s, s_next));
 }