Fixed merge problems

[xfstests-dev.git] / lib / databin.c

diff --git a/lib/databin.c b/lib/databin.c
index f09c2c86c7f17f72445009cdbd805a0e3bbb446b..98ab4b06a3ed8fc9bf4ff48d46963ffd13c8586c 100644 (file)
--- a/lib/databin.c
+++ b/lib/databin.c
@@ -96,14 +96,12 @@ int bsize;  /* size of buffer */
 int offset;    /* offset into the file where buffer starts */
 char **errmsg;
 {
-    int cnt;
-    unsigned char *chr;
-    int total;
-    long expbits;
-    long actbits;
+       int cnt;
+       unsigned char *chr;
+       long expbits;
+       long actbits;
 
        chr=buffer;
-       total=bsize;
 
        if ( errmsg != NULL ) {
            *errmsg = Errmsg;