From: Jonathan Amery <jdamery+zgit@ysolde.ucam.org>
Date: Mon, 6 Oct 2014 12:12:37 +0000 (+0100)
Subject: seekdist lines should have been removed during the merge
X-Git-Tag: debian/4.4.0~8^2~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=b6cbf4b9faaf02884298f300b6d911911f91d81f;p=chiark-utils.git

seekdist lines should have been removed during the merge
---

diff --git a/cprogs/acctdump.c b/cprogs/acctdump.c
index 98fab9c..1331049 100644
--- a/cprogs/acctdump.c
+++ b/cprogs/acctdump.c
@@ -289,7 +289,6 @@ static void processfile(FILE *file, const char *filename) {
       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)) { 
@@ -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);
-      seekdist= -2*(long)sizeof(as);
     }
   }
   if (ferror(file) || fclose(file)) { perror(filename); exit(8); }