merge
diff --git a/src/cmd/xd.c b/src/cmd/xd.c
index ab485a3..3e8ba5d 100644
--- a/src/cmd/xd.c
+++ b/src/cmd/xd.c
@@ -288,7 +288,7 @@
 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 @@
 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 @@
 {
 	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];