Use try-with-resources, skip bytes on the second pass

eaftan · Sep 16, 2024 · d40270c · d40270c
1 parent 20ca6b3
commit d40270c
Showing 1 changed file with 31 additions and 25 deletions.
diff --git a/src/main/java/edu/tufts/eaftan/hprofparser/parser/HprofParser.java b/src/main/java/edu/tufts/eaftan/hprofparser/parser/HprofParser.java
@@ -74,31 +74,37 @@ public void parse(File file) throws IOException {
      *   [u1]* - body
      */
 
-    FileInputStream fs = new FileInputStream(file);
-    DataInputStream in = new DataInputStream(new BufferedInputStream(fs));
-
-    // header
-    String format = readUntilNull(in);
-    int idSize = in.readInt();
-    long startTime = in.readLong();
-    handler.header(format, idSize, startTime);
-
-    // records
-    boolean done;
-    do {
-      done = parseRecord(in, idSize, true);
-    } while (!done);
-    in.close();
-
-    FileInputStream fsSecond = new FileInputStream(file);
-    DataInputStream inSecond = new DataInputStream(new BufferedInputStream(fsSecond));
-    readUntilNull(inSecond); // format
-    inSecond.readInt(); // idSize
-    inSecond.readLong(); // startTime
-    do {
-      done = parseRecord(inSecond, idSize, false);
-    } while (!done);
-    inSecond.close();
+    String format;
+    int idSize;
+    long startTime;
+    try (
+      FileInputStream fs = new FileInputStream(file);
+      DataInputStream in = new DataInputStream(new BufferedInputStream(fs));
+    ) {
+      // header
+      format = readUntilNull(in);
+      idSize = in.readInt();
+      startTime = in.readLong();
+      handler.header(format, idSize, startTime);
+
+      // records
+      boolean done;
+      do {
+        done = parseRecord(in, idSize, true);
+      } while (!done);
+    }
+
+    try (
+      FileInputStream fs = new FileInputStream(file);
+      DataInputStream in = new DataInputStream(new BufferedInputStream(fs));
+    ) {
+      in.skipBytes(format.length() + 1 + 4 + 8); // skip header (1 for null terminator)
+      boolean done;
+      do {
+        done = parseRecord(in, idSize, false);
+      } while (!done);
+    }
+
     handler.finished();
   }