Skip to content

Commit 97a600d

Browse files
p-x9p-x9
authored
Merge pull request #257 from p-x9/fix/codesign-fileslice-typo
Fix variable name typos from `fileSice` to `fileSlice`
2 parents 7085636 + 557b149 commit 97a600d

13 files changed

+36
-36
lines changed

‎Sources/MachOKit/AotCache.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public struct AotCache {
5050
extension AotCache {
5151
public var codeSign: MachOFile.CodeSign? {
5252
.init(
53-
fileSice: try! fileHandle.fileSlice(
53+
fileSlice: try! fileHandle.fileSlice(
5454
offset: numericCast(header.code_signature_offset),
5555
length: numericCast(header.code_signature_size)
5656
)

‎Sources/MachOKit/DyldCache.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ extension DyldCache {
329329
extension DyldCache {
330330
public var codeSign: MachOFile.CodeSign? {
331331
.init(
332-
fileSice: try! fileHandle.fileSlice(
332+
fileSlice: try! fileHandle.fileSlice(
333333
offset: numericCast(header.codeSignatureOffset),
334334
length: numericCast(header.codeSignatureSize)
335335
)

‎Sources/MachOKit/MachOFile+CodeSign.swift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,27 @@ extension MachOFile {
1919
public struct CodeSign {
2020
typealias FileSlice = File.FileSlice
2121

22-
internal let fileSice: FileSlice
22+
internal let fileSlice: FileSlice
2323
public let isSwapped: Bool // bigEndian => false
2424
}
2525
}
2626

2727
extension MachOFile.CodeSign {
28-
init(fileSice: FileSlice) {
29-
self.fileSice = fileSice
28+
init(fileSlice: FileSlice) {
29+
self.fileSlice = fileSlice
3030
self.isSwapped = CFByteOrderGetCurrent() != CFByteOrderBigEndian.rawValue
3131
}
3232
}
3333

3434
extension MachOFile.CodeSign {
3535
public var data: Data? {
36-
try? fileSice.readData(offset: 0, length: fileSice.size)
36+
try? fileSlice.readData(offset: 0, length: fileSlice.size)
3737
}
3838
}
3939

4040
extension MachOFile.CodeSign: CodeSignProtocol {
4141
public var superBlob: CodeSignSuperBlob? {
42-
var layout = fileSice.ptr
42+
var layout = fileSlice.ptr
4343
.assumingMemoryBound(to: CS_SuperBlob.self)
4444
.pointee
4545
if isSwapped { layout = layout.swapped }
@@ -55,7 +55,7 @@ extension MachOFile.CodeSign: CodeSignProtocol {
5555
return blobIndices
5656
.compactMap {
5757
let offset: Int = numericCast($0.offset)
58-
let ptr = fileSice.ptr.advanced(by: offset)
58+
let ptr = fileSlice.ptr.advanced(by: offset)
5959
let _blob = ptr.assumingMemoryBound(to: CS_GenericBlob.self).pointee
6060
let blob = CodeSignGenericBlob(
6161
layout: isSwapped ? _blob.swapped : _blob
@@ -83,7 +83,7 @@ extension MachOFile.CodeSign: CodeSignProtocol {
8383
return nil
8484
}
8585
let offset: Int = numericCast(index.offset)
86-
let ptr = fileSice.ptr.advanced(by: offset)
86+
let ptr = fileSlice.ptr.advanced(by: offset)
8787
var _blob = ptr
8888
.assumingMemoryBound(to: CS_SuperBlob.self)
8989
.pointee
@@ -112,13 +112,13 @@ extension MachOFile.CodeSign {
112112
) -> Data? {
113113
let offset: Int = numericCast(superBlob.offset) + numericCast(index.offset)
114114
guard let _blob: CodeSignGenericBlob = .load(
115-
from: fileSice.ptr,
115+
from: fileSlice.ptr,
116116
offset: offset,
117117
isSwapped: isSwapped
118118
) else { return nil }
119119

120120
let data = Data(
121-
bytes: fileSice.ptr.advanced(by: offset),
121+
bytes: fileSlice.ptr.advanced(by: offset),
122122
count: numericCast(_blob.length)
123123
)
124124
if includesGenericInfo {

‎Sources/MachOKit/MachOFile+DyldChainedFixups.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ extension MachOFile {
1818
public struct DyldChainedFixups {
1919
typealias FileSlice = File.FileSlice
2020

21-
let fileSice: FileSlice
21+
let fileSlice: FileSlice
2222
let isSwapped: Bool
2323
}
2424
}
2525

2626
extension MachOFile.DyldChainedFixups: DyldChainedFixupsProtocol {
2727
public var header: DyldChainedFixupsHeader? {
28-
let ret = fileSice.ptr
28+
let ret = fileSlice.ptr
2929
.assumingMemoryBound(to: DyldChainedFixupsHeader.self)
3030
.pointee
3131
return isSwapped ? ret.swapped : ret
@@ -34,7 +34,7 @@ extension MachOFile.DyldChainedFixups: DyldChainedFixupsProtocol {
3434
public var startsInImage: DyldChainedStartsInImage? {
3535
guard let header else { return nil }
3636
let offset: Int = numericCast(header.starts_offset)
37-
let ptr = fileSice.ptr
37+
let ptr = fileSlice.ptr
3838
.advanced(by: offset)
3939
let layout = ptr
4040
.assumingMemoryBound(to: DyldChainedStartsInImage.Layout.self)
@@ -51,7 +51,7 @@ extension MachOFile.DyldChainedFixups: DyldChainedFixupsProtocol {
5151
) -> [DyldChainedStartsInSegment] {
5252
guard let startsInImage else { return [] }
5353
let offsets: [Int] = {
54-
let ptr = fileSice.ptr
54+
let ptr = fileSlice.ptr
5555
.advanced(by: startsInImage.offset)
5656
.advanced(by: DyldChainedStartsInImage.layoutOffset(of: \.seg_info_offset))
5757
return UnsafeBufferPointer(
@@ -62,7 +62,7 @@ extension MachOFile.DyldChainedFixups: DyldChainedFixupsProtocol {
6262
.map { numericCast($0) }
6363
}()
6464

65-
let ptr = fileSice.ptr
65+
let ptr = fileSlice.ptr
6666
.advanced(by: startsInImage.offset)
6767
return offsets.enumerated().map { index, offset in
6868
let layout = ptr.advanced(by: offset)
@@ -84,7 +84,7 @@ extension MachOFile.DyldChainedFixups: DyldChainedFixupsProtocol {
8484
) -> [DyldChainedPage] {
8585
guard let startsInSegment else { return [] }
8686

87-
let ptr = fileSice.ptr
87+
let ptr = fileSlice.ptr
8888
.advanced(by: startsInSegment.offset)
8989
.advanced(by: startsInSegment.layoutOffset(of: \.page_start))
9090
.assumingMemoryBound(to: UInt16.self)
@@ -106,7 +106,7 @@ extension MachOFile.DyldChainedFixups: DyldChainedFixupsProtocol {
106106
return []
107107
}
108108
let offset: Int = numericCast(header.imports_offset)
109-
let ptr = fileSice.ptr
109+
let ptr = fileSlice.ptr
110110
.advanced(by: offset)
111111
let count: Int = numericCast(header.imports_count)
112112

@@ -142,7 +142,7 @@ extension MachOFile.DyldChainedFixups: DyldChainedFixupsProtocol {
142142

143143
public func symbolName(for nameOffset: Int) -> String? {
144144
guard let header else { return nil }
145-
let ptr = fileSice.ptr
145+
let ptr = fileSlice.ptr
146146
.advanced(by: numericCast(header.symbols_offset))
147147
.advanced(by: nameOffset)
148148
.assumingMemoryBound(to: CChar.self)

‎Sources/MachOKit/MachOFile+Strings.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@ extension MachOFile.UnicodeStrings {
9191
public struct Iterator: IteratorProtocol {
9292
public typealias Element = StringTableEntry
9393

94-
private let fileSice: FileSlice
94+
private let fileSlice: FileSlice
9595
private let tableSize: Int
9696
private let isSwapped: Bool
9797

9898
private var nextOffset: Int
9999

100100
init(fileSlice: FileSlice, isSwapped: Bool) {
101-
self.fileSice = fileSlice
101+
self.fileSlice = fileSlice
102102
self.tableSize = fileSlice.size
103103
self.nextOffset = 0
104104
self.isSwapped = isSwapped
@@ -107,7 +107,7 @@ extension MachOFile.UnicodeStrings {
107107
public mutating func next() -> Element? {
108108
guard nextOffset < tableSize else { return nil }
109109

110-
let ptr = UnsafeRawPointer(fileSice.ptr)
110+
let ptr = UnsafeRawPointer(fileSlice.ptr)
111111
.advanced(by: nextOffset)
112112
.assumingMemoryBound(to: Encoding.CodeUnit.self)
113113
var (string, offset) = ptr.readString(as: Encoding.self)

‎Sources/MachOKit/MachOFile.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ extension MachOFile {
507507
) else { return nil }
508508

509509
return .init(
510-
fileSice: fileSlice,
510+
fileSlice: fileSlice,
511511
isSwapped: isSwapped
512512
)
513513
}
@@ -579,7 +579,7 @@ extension MachOFile {
579579
) else { return nil }
580580

581581
return .init(
582-
fileSice: fileSlice
582+
fileSlice: fileSlice
583583
)
584584
}
585585
}

‎Sources/MachOKit/Model/Codesign/CodeDirectory/CodeSignCodeDirectory+codeLimit64.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extension CodeSignCodeDirectory {
1313
guard isSupportsCodeLimit64 else {
1414
return nil
1515
}
16-
let layout: CS_CodeDirectory_CodeLimit64 = signature.fileSice.ptr
16+
let layout: CS_CodeDirectory_CodeLimit64 = signature.fileSlice.ptr
1717
.advanced(by: offset)
1818
.advanced(by: layoutSize)
1919
.advanced(by: ScatterOffset.layoutSize)

‎Sources/MachOKit/Model/Codesign/CodeDirectory/CodeSignCodeDirectory+executableSegment.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extension CodeSignCodeDirectory {
1313
guard isSupportsExecSegment else {
1414
return nil
1515
}
16-
let layout: CS_CodeDirectory_ExecSeg = signature.fileSice.ptr
16+
let layout: CS_CodeDirectory_ExecSeg = signature.fileSlice.ptr
1717
.advanced(by: offset)
1818
.advanced(by: layoutSize)
1919
.advanced(by: ScatterOffset.layoutSize)

‎Sources/MachOKit/Model/Codesign/CodeDirectory/CodeSignCodeDirectory+runtime.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extension CodeSignCodeDirectory {
1313
guard isSupportsRuntime else {
1414
return nil
1515
}
16-
let layout: CS_CodeDirectory_Runtime = signature.fileSice.ptr
16+
let layout: CS_CodeDirectory_Runtime = signature.fileSlice.ptr
1717
.advanced(by: offset)
1818
.advanced(by: layoutSize)
1919
.advanced(by: ScatterOffset.layoutSize)
@@ -62,7 +62,7 @@ extension CodeSignCodeDirectory {
6262
let offset = offset
6363
+ numericCast(runtime.preEncryptOffset)
6464
+ index * size
65-
return try! signature.fileSice.readData(
65+
return try! signature.fileSlice.readData(
6666
offset: numericCast(offset),
6767
length: size
6868
)

‎Sources/MachOKit/Model/Codesign/CodeDirectory/CodeSignCodeDirectory+scatter.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extension CodeSignCodeDirectory {
1313
guard isSupportsScatter else {
1414
return nil
1515
}
16-
let layout: CS_CodeDirectory_Scatter = signature.fileSice.ptr
16+
let layout: CS_CodeDirectory_Scatter = signature.fileSlice.ptr
1717
.advanced(by: offset)
1818
.advanced(by: layoutSize)
1919
.assumingMemoryBound(to: CS_CodeDirectory_Scatter.self)

0 commit comments

Comments
 (0)