PERFORCE change 103897 for review

[John Birrell]

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

Change 103897 by jb at 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)