git.fiddlerwoaroof.com
Browse code

Finish last commit

Ed Langley authored on 06/05/2019 06:49:49
Showing 2 changed files
... ...
@@ -42,6 +42,16 @@
42 42
         (return-from find-object-in-pack-files
43 43
           (values pack mid))))))
44 44
 
45
+(defun read-object-from-pack (s)
46
+  (let* ((metadata (fwoar.bin-parser:extract-high s))
47
+         (type (get-object-type metadata))
48
+         (size (get-object-size metadata))
49
+         (object-data (chipz:decompress nil (chipz:make-dstate 'chipz:zlib) s)))
50
+    (list (cons :type (object-type->sym type))
51
+          (cons :decompressed-size size)
52
+          (cons :object-data object-data)
53
+          (cons :raw-data object-data))))
54
+
45 55
 (defun extract-object-from-pack (pack obj-number)
46 56
   (with-open-file (s (index-file pack) :element-type '(unsigned-byte 8))
47 57
     (with-open-file (p (pack-file pack) :element-type '(unsigned-byte 8))
... ...
@@ -131,16 +131,6 @@
131 131
     (values (cons :type (object-type->sym type))
132 132
             (cons :decompressed-size size))))
133 133
 
134
-(defun read-object-from-pack (s)
135
-  (let* ((metadata (fwoar.bin-parser:extract-high s))
136
-         (type (get-object-type metadata))
137
-         (size (get-object-size metadata))
138
-         (object-data (chipz:decompress nil (chipz:make-dstate 'chipz:zlib) s)))
139
-    (list (cons :type (object-type->sym type))
140
-          (cons :decompressed-size size)
141
-          (cons :object-data object-data)
142
-          (cons :raw-data object-data))))
143
-
144 134
 (defun get-first-commits-from-pack (idx pack n)
145 135
   (let ((toc (idx-toc idx))
146 136
         (result ()))