Merge pull request #8 from p-x9/feature/rename-machO-machOImage

Rename `MachO` to `MachOImage`
p-x9 · Dec 25, 2023 · 9857036 · 9857036
2 parents bba0138 + b597e67
commit 9857036
Show file tree

Hide file tree

Showing 14 changed files with 78 additions and 79 deletions.
diff --git a/README.md b/README.md
@@ -31,14 +31,14 @@ It can be initialized by using the Mach-O Header pointer obtained by `_dyld_get_
 
 ```swift
 guard let mh = _dyld_get_image_header(0) else { return }
-let machO = MachO(ptr: mh)
+let machO = MachOImage(ptr: mh)
 ```
 
 Alternatively, it can be initialized using the name.
 
 ```swift
 // /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation
-guard let machO = MachO(name: "Foundation") else { return }
+guard let machO = MachOImage(name: "Foundation") else { return }
 ```
 
 ### Load from file

diff --git a/Sources/MachOKit/LoadCommand/LinkerOptionCommand.swift b/Sources/MachOKit/LoadCommand/LinkerOptionCommand.swift
@@ -28,7 +28,7 @@ extension LinkerOptionCommand {
             .advanced(by: offset)
             .advanced(by: layoutSize)
             .assumingMemoryBound(to: CChar.self)
-        let strings = MachO.Strings(
+        let strings = MachOImage.Strings(
             basePointer: ptr,
             tableSize: Int(layout.cmdsize) - layoutSize
         ).map(\.string)

diff --git a/Sources/MachOKit/LoadCommand/Model/Section.swift b/Sources/MachOKit/LoadCommand/Model/Section.swift
@@ -14,7 +14,7 @@ public protocol SectionProtocol: LayoutWrapper {
     var flags: SectionFlags { get }
 
     /// returns nil except when type is `cstring_literals
-    func strings(ptr: UnsafeRawPointer) -> MachO.Strings?
+    func strings(ptr: UnsafeRawPointer) -> MachOImage.Strings?
 
     /// returns nil except when type is `cstring_literals
     func strings(in machO: MachOFile) -> MachOFile.Strings?
@@ -65,13 +65,13 @@ extension SectionProtocol {
         ptr: UnsafeRawPointer,
         sectionOffset: UInt32,
         sectionSize: UInt64
-    ) -> MachO.Strings? {
+    ) -> MachOImage.Strings? {
         guard flags.type == .cstring_literals else { return nil }
         let basePointer = ptr
             .advanced(by: numericCast(sectionOffset))
             .assumingMemoryBound(to: CChar.self)
         let tableSize = Int(sectionSize)
-        return MachO.Strings(
+        return MachOImage.Strings(
             basePointer: basePointer,
             tableSize: tableSize
         )
@@ -97,7 +97,7 @@ extension SectionProtocol {
 }
 
 extension Section {
-    public func strings(ptr: UnsafeRawPointer) -> MachO.Strings? {
+    public func strings(ptr: UnsafeRawPointer) -> MachOImage.Strings? {
         _strings(ptr: ptr, sectionOffset: layout.offset, sectionSize: UInt64(layout.size))
     }
 
@@ -107,7 +107,7 @@ extension Section {
 }
 
 extension Section64 {
-    public func strings(ptr: UnsafeRawPointer) -> MachO.Strings? {
+    public func strings(ptr: UnsafeRawPointer) -> MachOImage.Strings? {
         _strings(ptr: ptr, sectionOffset: layout.offset, sectionSize: layout.size)
     }
 

diff --git a/Sources/MachOKit/MachO+BindOperations.swift → .../MachOKit/MachOImage+BindOperations.swift b/Sources/MachOKit/MachO+BindOperations.swift → .../MachOKit/MachOImage+BindOperations.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-extension MachO {
+extension MachOImage {
     public struct BindOperations: Sequence {
         public let basePointer: UnsafePointer<UInt8>
         public let bindSize: Int
@@ -19,7 +19,7 @@ extension MachO {
     }
 }
 
-extension MachO.BindOperations {
+extension MachOImage.BindOperations {
     init(
         ptr: UnsafeRawPointer,
         text: SegmentCommand64,
@@ -53,7 +53,7 @@ extension MachO.BindOperations {
     }
 }
 
-extension MachO.BindOperations {
+extension MachOImage.BindOperations {
     public struct Iterator: IteratorProtocol {
         public typealias Element = BindOperation
 

diff --git a/...es/MachOKit/MachO+ExportTrieEntries.swift → ...chOKit/MachOImage+ExportTrieEntries.swift b/...es/MachOKit/MachO+ExportTrieEntries.swift → ...chOKit/MachOImage+ExportTrieEntries.swift
@@ -1,5 +1,5 @@
 //
-//  MachO+ExportTrieEntries.swift
+//  MachOImage+ExportTrieEntries.swift
 //
 //
 //  Created by p-x9 on 2023/12/04.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-extension MachO {
+extension MachOImage {
     public struct ExportTrieEntries: Sequence {
         public let basePointer: UnsafePointer<UInt8>
         public let exportSize: Int
@@ -19,7 +19,7 @@ extension MachO {
     }
 }
 
-extension MachO.ExportTrieEntries {
+extension MachOImage.ExportTrieEntries {
     init(
         ptr: UnsafeRawPointer,
         text: SegmentCommand64,
@@ -78,7 +78,7 @@ extension MachO.ExportTrieEntries {
     }
 }
 
-extension MachO.ExportTrieEntries {
+extension MachOImage.ExportTrieEntries {
     public struct Iterator: IteratorProtocol {
         public typealias Element = ExportTrieEntry
 

diff --git a/Sources/MachOKit/MachO+LoadCommands.swift → ...es/MachOKit/MachOImage+LoadCommands.swift b/Sources/MachOKit/MachO+LoadCommands.swift → ...es/MachOKit/MachOImage+LoadCommands.swift
@@ -1,5 +1,5 @@
 //
-//  MachO+LoadCommands.swift
+//  MachOImage+LoadCommands.swift
 //
 //
 //  Created by p-x9 on 2023/11/28.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-extension MachO {
+extension MachOImage {
     public struct LoadCommands: Sequence {
         public let start: UnsafeRawPointer
         public let numberOfCommands: Int
@@ -22,7 +22,7 @@ extension MachO {
     }
 }
 
-extension MachO.LoadCommands {
+extension MachOImage.LoadCommands {
     public struct Iterator: IteratorProtocol {
         public typealias Element = LoadCommand
 
@@ -57,4 +57,4 @@ extension MachO.LoadCommands {
     }
 }
 
-extension MachO.LoadCommands: LoadCommandsProtocol {}
+extension MachOImage.LoadCommands: LoadCommandsProtocol {}
diff --git a/...ces/MachOKit/MachO+RebaseOperations.swift → ...achOKit/MachOImage+RebaseOperations.swift b/...ces/MachOKit/MachO+RebaseOperations.swift → ...achOKit/MachOImage+RebaseOperations.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-extension MachO {
+extension MachOImage {
     public struct RebaseOperations: Sequence {
         public let basePointer: UnsafePointer<UInt8>
         public let rebaseSize: Int
@@ -19,7 +19,7 @@ extension MachO {
     }
 }
 
-extension MachO.RebaseOperations {
+extension MachOImage.RebaseOperations {
     init(
         ptr: UnsafeRawPointer,
         text: SegmentCommand64,
@@ -51,7 +51,7 @@ extension MachO.RebaseOperations {
     }
 }
 
-extension MachO.RebaseOperations {
+extension MachOImage.RebaseOperations {
     public struct Iterator: IteratorProtocol {
         public typealias Element = RebaseOperation
 

diff --git a/Sources/MachOKit/MachO+Strings.swift → Sources/MachOKit/MachOImage+Strings.swift b/Sources/MachOKit/MachO+Strings.swift → Sources/MachOKit/MachOImage+Strings.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-extension MachO {
+extension MachOImage {
     public struct Strings: Sequence {
         public let basePointer: UnsafePointer<CChar>
         public let tableSize: Int
@@ -22,7 +22,7 @@ extension MachO {
     }
 }
 
-extension MachO.Strings {
+extension MachOImage.Strings {
     init(
         ptr: UnsafeRawPointer,
         text: SegmentCommand64,
@@ -52,7 +52,7 @@ extension MachO.Strings {
     }
 }
 
-extension MachO.Strings {
+extension MachOImage.Strings {
     public struct Iterator: IteratorProtocol {
         public typealias Element = StringTableEntry
 

diff --git a/Sources/MachOKit/MachO+Symbols.swift → Sources/MachOKit/MachOImage+Symbols.swift b/Sources/MachOKit/MachO+Symbols.swift → Sources/MachOKit/MachOImage+Symbols.swift
@@ -1,5 +1,5 @@
 //
-//  MachO+Symbols..swift
+//  MachOImage+Symbols..swift
 //
 //
 //  Created by p-x9 on 2023/11/28.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-extension MachO {
+extension MachOImage {
     public struct Symbol: SymbolProtocol {
         public let nameC: UnsafePointer<CChar>
 
@@ -21,14 +21,14 @@ extension MachO {
     }
 }
 
-extension MachO.Symbol {
+extension MachOImage.Symbol {
     public var name: String {
         .init(cString: nameC)
     }
 }
 
 // https://stackoverflow.com/questions/20481058/find-pathname-from-dlopen-handle-on-osx
-extension MachO {
+extension MachOImage {
     public struct Symbols64: Sequence {
         public let ptr: UnsafeRawPointer
         public let text: SegmentCommand64
@@ -68,7 +68,7 @@ extension MachO {
     }
 }
 
-extension MachO {
+extension MachOImage {
     public struct Symbols: Sequence {
         public let ptr: UnsafeRawPointer
         public let text: SegmentCommand
@@ -108,9 +108,9 @@ extension MachO {
     }
 }
 
-extension MachO.Symbols64 {
+extension MachOImage.Symbols64 {
     public struct Iterator: IteratorProtocol {
-        public typealias Element = MachO.Symbol
+        public typealias Element = MachOImage.Symbol
 
         public let stringBase: UnsafePointer<CChar>
         public let addressStart: Int
@@ -145,7 +145,7 @@ extension MachO.Symbols64 {
                 .advanced(by: numericCast(symbol.n_un.n_strx))
             let address = addressStart + numericCast(symbol.n_value)
 
-            return MachO.Symbol(
+            return MachOImage.Symbol(
                 nameC: str,
                 offset: address,
                 nlist: Nlist64(layout: symbol)
@@ -154,9 +154,9 @@ extension MachO.Symbols64 {
     }
 }
 
-extension MachO.Symbols {
+extension MachOImage.Symbols {
     public struct Iterator: IteratorProtocol {
-        public typealias Element = MachO.Symbol
+        public typealias Element = MachOImage.Symbol
 
         public let stringBase: UnsafePointer<CChar>
         public let addressStart: Int
@@ -191,7 +191,7 @@ extension MachO.Symbols {
                 .advanced(by: Int(symbol.n_un.n_strx))
             let address = addressStart + numericCast(symbol.n_value)
 
-            return MachO.Symbol(
+            return MachOImage.Symbol(
                 nameC: str,
                 offset: address,
                 nlist: Nlist(layout: symbol)