commit 1adb2a07bff16932f070a29af8460c35be34fb65
from: Russ Cox <rsc@swtch.com>
date: Thu Feb 05 04:12:48 2009 UTC

merge

commit - 65a34c7fac1524cb3f40189f1bff8c3226d80710
commit + 1adb2a07bff16932f070a29af8460c35be34fb65
blob - ab485a32099b65ed05f8ddd9809f102cf82947f6
blob + 3e8ba5d334b0351950d296a4a1946b7aa3c66bd7
--- src/cmd/xd.c
+++ src/cmd/xd.c
@@ -288,7 +288,7 @@ void
 fmt1(char *f)
 {
 	int i;
-	for(i=0; i<ndata; i+=sizeof(unsigned short))
+	for(i=0; i<ndata; i+=2)
 		xprint(f, (data[i]<<8)|data[i+1]);
 }
 
@@ -296,7 +296,7 @@ void
 fmt2(char *f)
 {
 	int i;
-	for(i=0; i<ndata; i+=sizeof(unsigned long))
+	for(i=0; i<ndata; i+=4)
 		xprint(f, (u32int)((data[i]<<24)|(data[i+1]<<16)|(data[i+2]<<8)|data[i+3]));
 }
 
@@ -305,7 +305,7 @@ fmt3(char *f)
 {
 	int i;
 	unsigned long long v;
-	for(i=0; i<ndata; i+=sizeof(unsigned long long)){
+	for(i=0; i<ndata; i+=8){
 		v = (data[i]<<24)|(data[i+1]<<16)|(data[i+2]<<8)|data[i+3];
 		v <<= 32;
 		v |= (data[i+4]<<24)|(data[i+1+4]<<16)|(data[i+2+4]<<8)|data[i+3+4];