Remove the length field from the index entries in data pack files.

tools/data_pack/data_pack.py

Index: tools/data_pack/data_pack.py
diff --git a/tools/data_pack/data_pack.py b/tools/data_pack/data_pack.py
index 571842eabea967f6d36f4200cbc1154b824ff236..2ed71d29c5393842731a63259c906320c2bf1bca 100755
--- a/tools/data_pack/data_pack.py
+++ b/tools/data_pack/data_pack.py
@@ -9,7 +9,7 @@ See base/pack_file* for details.
 
 import struct
 
-FILE_FORMAT_VERSION = 2
+FILE_FORMAT_VERSION = 3
 HEADER_LENGTH = 2 * 4  # Two uint32s. (file version and number of entries)
 
 class WrongFileVersion(Exception):
@@ -26,13 +26,21 @@ def ReadDataPack(input_file):
     raise WrongFileVersion
 
   resources = {}
+  if num_entries == 0:
+    return resources
+
   # Read the index and data.
   data = data[HEADER_LENGTH:]
-  kIndexEntrySize = 2 + 2 * 4  # Each entry is 1 uint16 and 2 uint32s.
-  for _ in range(num_entries):
-    id, offset, length = struct.unpack("<HII", data[:kIndexEntrySize])
+  kIndexEntrySize = 2 + 4  # Each entry is a uint16 and a uint32.
+  for _ in range(num_entries - 1):
+    id, offset = struct.unpack("<HI", data[:kIndexEntrySize])
     data = data[kIndexEntrySize:]
-    resources[id] = original_data[offset:offset + length]
+    next_id, next_offset = struct.unpack("<HI", data[:kIndexEntrySize])
+    resources[id] = original_data[offset:next_offset]
+
+  # The last entry goes to the end of the file.
+  last_id, last_offset = struct.unpack("<HI", data[:kIndexEntrySize])
+  resources[last_id] = original_data[last_offset:]
 
   return resources
 
@@ -44,13 +52,13 @@ def WriteDataPack(resources, output_file):
   # Write file header.
   file.write(struct.pack("<II", FILE_FORMAT_VERSION, len(ids)))
 
-  # Each entry is 1 uint16 and 2 uint32s.
-  index_length = len(ids) * (2 + 2 * 4)
+  # Each entry is a uint16 and a uint32.
+  index_length = len(ids) * (2 + 4)
 
   # Write index.
   data_offset = HEADER_LENGTH + index_length
   for id in ids:
-    file.write(struct.pack("<HII", id, data_offset, len(resources[id])))
+    file.write(struct.pack("<HI", id, data_offset))
     data_offset += len(resources[id])
 
   # Write data.