From owner-p4-projects@FreeBSD.ORG  Mon Aug 14 20:13:23 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BF52A16A4E0; Mon, 14 Aug 2006 20:13:23 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 85FED16A4DE
	for <perforce@freebsd.org>; Mon, 14 Aug 2006 20:13:23 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 33ACD43D46
	for <perforce@freebsd.org>; Mon, 14 Aug 2006 20:13:23 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EKDNwp025419
	for <perforce@freebsd.org>; Mon, 14 Aug 2006 20:13:23 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EKDMmn025416
	for perforce@freebsd.org; Mon, 14 Aug 2006 20:13:22 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 14 Aug 2006 20:13:22 GMT
Message-Id: <200608142013.k7EKDMmn025416@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 103897 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Aug 2006 20:13:24 -0000

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

Change 103897 by jb@jb_freebsd2 on 2006/08/14 20:13:05

	Fix a couple of variable types to match the macro they are in.
	
	Offset the pointer for the READ_IDENT macro.

Affected files ...

.. //depot/projects/dtrace/src/lib/libelf/libelf_convert.m4#3 edit

Differences ...

==== //depot/projects/dtrace/src/lib/libelf/libelf_convert.m4#3 (text+ko) ====

@@ -152,7 +152,7 @@
 		(X)		= _t;					\
 	} while (0)
 #define	READ_WORD(P,X)	do {						\
-		uint16_t _t;						\
+		uint32_t _t;						\
 		unsigned char *const _q = (unsigned char *) &_t;	\
 		const unsigned char *const _p =				\
 			(const unsigned char *) (P);			\
@@ -167,7 +167,7 @@
 #define	READ_OFF32(P,X)		READ_WORD(P,X)
 #define	READ_SWORD(P,X)		READ_WORD(P,X)
 #define	READ_WORD64(P,X)	do {					\
-		uint16_t _t;						\
+		uint64_t _t;						\
 		unsigned char *const _q = (unsigned char *) &_t;	\
 		const unsigned char *const _p =				\
 			(const unsigned char *) (P);			\
@@ -188,6 +188,7 @@
 #define	READ_XWORD(P,X)		READ_WORD64(P,X)
 #define	READ_IDENT(P,X)		do {					\
 		(void) memcpy((X), (P), sizeof((X)));			\
+		(P)             = (P) + sizeof((X));			\
 	} while (0)
 
 divert(-1)