fix: dyld.GetSubCacheInfo for the 'primary' sub-cache

blacktop · Jun 18, 2024 · 9eb7852 · 9eb7852
1 parent 6bebd30
commit 9eb7852
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/internal/commands/dsc/dsc.go b/internal/commands/dsc/dsc.go
@@ -614,21 +614,11 @@ func GetStrings(f *dyld.File, pattern string) ([]String, error) {
 			if mapping, err := f.GetMappingForOffsetForUUID(uuid, match); err == nil {
 				s.Mapping = mapping.Name
 				if sc := f.GetSubCacheInfo(uuid); sc != nil {
-					s.Mapping += ", sub_cache"
-					if sc.Extention != "" {
-						s.Mapping += fmt.Sprintf(" (%s)", sc.Extention)
-					} else {
-						s.Mapping += " (primary)"
-					}
+					s.Mapping += fmt.Sprintf(", sub_cache (%s)", sc.Extention)
 				}
 			} else {
 				if sc := f.GetSubCacheInfo(uuid); sc != nil {
-					s.Mapping += "sub_cache"
-					if sc.Extention != "" {
-						s.Mapping += fmt.Sprintf(" (%s)", sc.Extention)
-					} else {
-						s.Mapping += " (primary)"
-					}
+					s.Mapping += fmt.Sprintf("sub_cache (%s)", sc.Extention)
 				}
 			}
 			if str, err := f.GetCStringAtOffsetForUUID(uuid, match); err == nil {

diff --git a/pkg/dyld/file.go b/pkg/dyld/file.go
@@ -688,7 +688,7 @@ func (f *File) GetSubCacheInfo(uuid mtypes.UUID) *SubcacheEntry {
 		return &SubcacheEntry{
 			UUID:          uuid,
 			CacheVMOffset: 0,
-			Extention:     "",
+			Extention:     "primary",
 		}
 	}
 	if f.symUUID == uuid {