tmerge - plan9port - [fork] Plan 9 from user space
HTML git clone git://src.adamsgaard.dk/plan9port
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit 1adb2a07bff16932f070a29af8460c35be34fb65
DIR parent 65a34c7fac1524cb3f40189f1bff8c3226d80710
HTML Author: Russ Cox <rsc@swtch.com>
Date: Wed, 4 Feb 2009 20:12:48 -0800
merge
Diffstat:
M src/cmd/xd.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
DIR diff --git a/src/cmd/xd.c b/src/cmd/xd.c
t@@ -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]);
}
t@@ -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]));
}
t@@ -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];