From 78fd83dda23546b4685cc09bb4542e0d627520fc Mon Sep 17 00:00:00 2001
From: Timofey Solomko <tsolomko@gmail.com>
Date: Fri, 9 Dec 2016 01:08:49 +0300
Subject: [PATCH] Adopted removal of alignedBytes() in other code.

---
 Sources/Deflate.swift     |  6 ++++--
 Sources/GzipArchive.swift | 10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Sources/Deflate.swift b/Sources/Deflate.swift
index db22df3d..6f6e2075 100644
--- a/Sources/Deflate.swift
+++ b/Sources/Deflate.swift
@@ -69,8 +69,10 @@ public class Deflate: DecompressionAlgorithm {
                 guard length & nlength == 0 else { throw DeflateError.WrongBlockLengths }
                 // Process uncompressed data into the output
                 // TODO: Replace precondition with guard and error throwing.
-                precondition(pointerData.bitShift == 0, "Misaligned byte.")
-                out.append(contentsOf: pointerData.alignedBytes(count: length))
+                precondition(pointerData.bitMask == 1, "Misaligned byte.")
+                for _ in 0..<length {
+                    out.append(pointerData.alignedByte())
+                }
             } else if blockType == [1, 0] || blockType == [0, 1] {
                 // Block with Huffman coding (either static or dynamic)
 
diff --git a/Sources/GzipArchive.swift b/Sources/GzipArchive.swift
index c8670edf..2878836c 100644
--- a/Sources/GzipArchive.swift
+++ b/Sources/GzipArchive.swift
@@ -38,10 +38,10 @@ public class GzipArchive: Archive {
 
     struct ServiceInfo: Equatable {
 
-        let magic: [UInt8]
+        let magic: Int
         let method: UInt8
         let flags: UInt8
-        let mtime: [UInt8]
+        let mtime: Int
         let extraFlags: UInt8
         let osType: UInt8
         // Optional fields
@@ -64,8 +64,8 @@ public class GzipArchive: Archive {
 
     static func serviceInfo(pointerData: DataWithPointer) throws -> ServiceInfo {
         // First two bytes should be correct 'magic' bytes
-        let magic = pointerData.alignedBytes(count: 2)
-        guard magic == [31, 139] else { throw GzipError.WrongMagic }
+        let magic = pointerData.intFromBits(count: 16)
+        guard magic == 0x1f8b else { throw GzipError.WrongMagic }
 
         // Third byte is a method of compression. Only type 8 (DEFLATE) compression is supported
         let method = pointerData.alignedByte()
@@ -75,7 +75,7 @@ public class GzipArchive: Archive {
         var serviceInfo = ServiceInfo(magic: magic,
                                       method: method,
                                       flags: pointerData.alignedByte(),
-                                      mtime: pointerData.alignedBytes(count: 4),
+                                      mtime: pointerData.intFromBits(count: 32),
                                       extraFlags: pointerData.alignedByte(),
                                       osType: pointerData.alignedByte(),
                                       fileName: "", comment: "", crc: 0)