chiark
/
gitweb
/
~ian
/
chiark-utils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6ff8c3d
)
seekdist lines should have been removed during the merge
author
Jonathan Amery
<jdamery+zgit@ysolde.ucam.org>
Mon, 6 Oct 2014 12:12:37 +0000
(13:12 +0100)
committer
Jonathan Amery
<jdamery+zgit@ysolde.ucam.org>
Mon, 6 Oct 2014 12:12:37 +0000
(13:12 +0100)
cprogs/acctdump.c
patch
|
blob
|
history
diff --git
a/cprogs/acctdump.c
b/cprogs/acctdump.c
index 98fab9c55d4f96d0d782500894c99a5c1f62b4d1..133104938fabd6d4b7d3b5ea7d872bf59ac8c0aa 100644
(file)
--- a/
cprogs/acctdump.c
+++ b/
cprogs/acctdump.c
@@
-289,7
+289,6
@@
static void processfile(FILE *file, const char *filename) {
printrecord(&as,filename);
}
} else {
printrecord(&as,filename);
}
} else {
- long seekdist= -(long)sizeof(as);
r= fseek(file,0,SEEK_END); if (r) { perror(filename); exit(8); }
pos= ftell(file); if (pos==-1) { perror(filename); exit(8); }
if (pos % sizeof(as)) {
r= fseek(file,0,SEEK_END); if (r) { perror(filename); exit(8); }
pos= ftell(file); if (pos==-1) { perror(filename); exit(8); }
if (pos % sizeof(as)) {
@@
-303,7
+302,6
@@
static void processfile(FILE *file, const char *filename) {
r= fseek(file,pos,SEEK_SET); if (r==-1) { perror(filename); exit(8); }
r= fread(&as,1,sizeof(as),file); if (r!=sizeof(as)) { perror(filename); exit(8); }
printrecord(&as,filename);
r= fseek(file,pos,SEEK_SET); if (r==-1) { perror(filename); exit(8); }
r= fread(&as,1,sizeof(as),file); if (r!=sizeof(as)) { perror(filename); exit(8); }
printrecord(&as,filename);
- seekdist= -2*(long)sizeof(as);
}
}
if (ferror(file) || fclose(file)) { perror(filename); exit(8); }
}
}
if (ferror(file) || fclose(file)) { perror(filename); exit(8); }