turn off debug flags

lechium · Sep 26, 2020 · 91c965e · 91c965e
1 parent 3defffc
commit 91c965e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 30 deletions.
diff --git a/CDMachOFileDataCursor.m b/CDMachOFileDataCursor.m
@@ -18,7 +18,7 @@ @implementation CDMachOFileDataCursor
 
 - (id)initWithFile:(CDMachOFile *)machOFile;
 {
-    NSLog(@"initWithFile: %@", machOFile);
+    //NSLog(@"initWithFile: %@", machOFile);
     return [self initWithFile:machOFile offset:0];
 }
 
@@ -27,7 +27,7 @@ - (id)initWithFile:(CDMachOFile *)machOFile offset:(NSUInteger)offset;
     if (offset == 0){
         offset = 4096;
     }
-    NSLog(@"initWithFile: %@ offset: 0x%08lx", machOFile, offset);
+    //NSLog(@"initWithFile: %@ offset: 0x%08lx", machOFile, offset);
 
     if ((self = [super initWithData:machOFile.data])) {
         self.machOFile = machOFile;
@@ -39,7 +39,7 @@ - (id)initWithFile:(CDMachOFile *)machOFile offset:(NSUInteger)offset;
 
 - (id)initWithFile:(CDMachOFile *)machOFile address:(NSUInteger)address;
 {
-    NSLog(@"initWithFile: %@ address: 0x%08lx", machOFile, address);
+    //NSLog(@"initWithFile: %@ address: 0x%08lx", machOFile, address);
     if ((self = [super initWithData:machOFile.data])) {
         self.machOFile = machOFile;
         [self setAddress:address];

diff --git a/CDObjectiveC2Processor.m b/CDObjectiveC2Processor.m
@@ -68,7 +68,7 @@ - (CDOCProtocol *)protocolAtAddress:(uint64_t)address;
     if (protocol == nil) {
         protocol = [[CDOCProtocol alloc] init];
         [self.protocolUniquer setProtocol:protocol withAddress:address];
-        NSLog(@"%s, address=%016lx", _cmd, address);
+        //NSLog(@"%s, address=%016lx", _cmd, address);
         CDMachOFileDataCursor *cursor = [[CDMachOFileDataCursor alloc] initWithFile:self.machOFile address:address];
         NSParameterAssert([cursor offset] != 0);
 
@@ -96,9 +96,9 @@ - (CDOCProtocol *)protocolAtAddress:(uint64_t)address;
             }
         }
 
-        NSLog(@"----------------------------------------");
-        NSLog(@"%016lx %016lx %016lx %016lx", objc2Protocol.isa, objc2Protocol.name, objc2Protocol.protocols, objc2Protocol.instanceMethods);
-        NSLog(@"%016lx %016lx %016lx %016lx", objc2Protocol.classMethods, objc2Protocol.optionalInstanceMethods, objc2Protocol.optionalClassMethods, objc2Protocol.instanceProperties);
+        //NSLog(@"----------------------------------------");
+        //NSLog(@"%016lx %016lx %016lx %016lx", objc2Protocol.isa, objc2Protocol.name, objc2Protocol.protocols, objc2Protocol.instanceMethods);
+        //NSLog(@"%016lx %016lx %016lx %016lx", objc2Protocol.classMethods, objc2Protocol.optionalInstanceMethods, objc2Protocol.optionalClassMethods, objc2Protocol.instanceProperties);
 
         NSString *str = [self.machOFile stringAtAddress:objc2Protocol.name];
         [protocol setName:str];
@@ -153,9 +153,9 @@ - (CDOCCategory *)loadCategoryAtAddress:(uint64_t)address;
     objc2Category.instanceProperties = [cursor readPtr];
     objc2Category.v7                 = [cursor readPtr];
     objc2Category.v8                 = [cursor readPtr];
-    NSLog(@"----------------------------------------");
-    NSLog(@"%016lx %016lx %016lx %016lx", objc2Category.name, objc2Category.class, objc2Category.instanceMethods, objc2Category.classMethods);
-    NSLog(@"%016lx %016lx %016lx %016lx", objc2Category.protocols, objc2Category.instanceProperties, objc2Category.v7, objc2Category.v8);
+    //NSLog(@"----------------------------------------");
+    //NSLog(@"%016lx %016lx %016lx %016lx", objc2Category.name, objc2Category.class, objc2Category.instanceMethods, objc2Category.classMethods);
+    //NSLog(@"%016lx %016lx %016lx %016lx", objc2Category.protocols, objc2Category.instanceProperties, objc2Category.v7, objc2Category.v8);
 
     CDOCCategory *category = [[CDOCCategory alloc] init];
     NSString *str = [self.machOFile stringAtAddress:objc2Category.name];
@@ -179,10 +179,10 @@ - (CDOCCategory *)loadCategoryAtAddress:(uint64_t)address;
         NSString *externalClassName = nil;
         if ([self.machOFile hasRelocationEntryForAddress2:classNameAddress]) {
             externalClassName = [self.machOFile externalClassNameForAddress2:classNameAddress];
-            NSLog(@"category: got external class name (2): %@", [category className]);
+            //NSLog(@"category: got external class name (2): %@", [category className]);
         } else if ([self.machOFile hasRelocationEntryForAddress:classNameAddress]) {
             externalClassName = [self.machOFile externalClassNameForAddress:classNameAddress];
-            NSLog(@"category: got external class name (1): %@", externalClassName);
+            //NSLog(@"category: got external class name (1): %@", externalClassName);
         } else if (objc2Category.class != 0) {
             CDOCClass *aClass = [self classWithAddress:objc2Category.class];
             category.classRef = [[CDOCClassReference alloc] initWithClassObject:aClass];
@@ -209,7 +209,7 @@ - (CDOCClass *)loadClassAtAddress:(uint64_t)address;
     if (class)
         return class;
 
-    NSLog(@"%s, address=%016lx", _cmd, address);
+    //NSLog(@"%s, address=%016lx", _cmd, address);
 
     CDMachOFileDataCursor *cursor = [[CDMachOFileDataCursor alloc] initWithFile:self.machOFile address:address];
     NSParameterAssert([cursor offset] != 0);
@@ -227,8 +227,8 @@ - (CDOCClass *)loadClassAtAddress:(uint64_t)address;
     objc2Class.reserved1  = [cursor readPtr];
     objc2Class.reserved2  = [cursor readPtr];
     objc2Class.reserved3  = [cursor readPtr];
-    NSLog(@"%016lx %016lx %016lx %016lx", objc2Class.isa, objc2Class.superclass, objc2Class.cache, objc2Class.vtable);
-    NSLog(@"%016lx %016lx %016lx %016lx", objc2Class.data, objc2Class.reserved1, objc2Class.reserved2, objc2Class.reserved3);
+    //NSLog(@"%016lx %016lx %016lx %016lx", objc2Class.isa, objc2Class.superclass, objc2Class.cache, objc2Class.vtable);
+    //NSLog(@"%016lx %016lx %016lx %016lx", objc2Class.data, objc2Class.reserved1, objc2Class.reserved2, objc2Class.reserved3);
 
     NSParameterAssert(objc2Class.data != 0);
     [cursor setAddress:objc2Class.data];
@@ -250,12 +250,12 @@ - (CDOCClass *)loadClassAtAddress:(uint64_t)address;
     objc2ClassData.weakIvarLayout = [cursor readPtr];
     objc2ClassData.baseProperties = [cursor readPtr];
 
-    NSLog(@"%08x %08x %08x %08x", objc2ClassData.flags, objc2ClassData.instanceStart, objc2ClassData.instanceSize, objc2ClassData.reserved);
+    //NSLog(@"%08x %08x %08x %08x", objc2ClassData.flags, objc2ClassData.instanceStart, objc2ClassData.instanceSize, objc2ClassData.reserved);
 
-    NSLog(@"%016lx %016lx %016lx %016lx", objc2ClassData.ivarLayout, objc2ClassData.name, objc2ClassData.baseMethods, objc2ClassData.baseProtocols);
-    NSLog(@"%016lx %016lx %016lx %016lx", objc2ClassData.ivars, objc2ClassData.weakIvarLayout, objc2ClassData.baseProperties);
+    //NSLog(@"%016lx %016lx %016lx %016lx", objc2ClassData.ivarLayout, objc2ClassData.name, objc2ClassData.baseMethods, objc2ClassData.baseProtocols);
+    //NSLog(@"%016lx %016lx %016lx %016lx", objc2ClassData.ivars, objc2ClassData.weakIvarLayout, objc2ClassData.baseProperties);
     NSString *str = [self.machOFile stringAtAddress:objc2ClassData.name];
-    NSLog(@"name = %@", str);
+    //NSLog(@"name = %@", str);
 
     CDOCClass *aClass = [[CDOCClass alloc] init];
     [aClass setName:str];
@@ -278,10 +278,10 @@ - (CDOCClass *)loadClassAtAddress:(uint64_t)address;
         NSString *superClassName = nil;
         if ([self.machOFile hasRelocationEntryForAddress2:classNameAddress]) {
             superClassName = [self.machOFile externalClassNameForAddress2:classNameAddress];
-            NSLog(@"class: got external class name (2): %@", [aClass superClassName]);
+            //NSLog(@"class: got external class name (2): %@", [aClass superClassName]);
         } else if ([self.machOFile hasRelocationEntryForAddress:classNameAddress]) {
             superClassName = [self.machOFile externalClassNameForAddress:classNameAddress];
-            NSLog(@"class: got external class name (1): %@", [aClass superClassName]);
+            //NSLog(@"class: got external class name (1): %@", [aClass superClassName]);
         } else if (objc2Class.superclass != 0) {
             CDOCClass *sc = [self loadClassAtAddress:objc2Class.superclass];
             aClass.superClassRef = [[CDOCClassReference alloc] initWithClassObject:sc];
@@ -317,7 +317,7 @@ - (NSArray *)loadPropertiesAtAddress:(uint64_t)address;
 
         CDMachOFileDataCursor *cursor = [[CDMachOFileDataCursor alloc] initWithFile:self.machOFile address:address];
         NSParameterAssert([cursor offset] != 0);
-        NSLog(@"property list data offset: %lu", [cursor offset]);
+        //NSLog(@"property list data offset: %lu", [cursor offset]);
 
         listHeader.entsize = [cursor readInt32];
         listHeader.count = [cursor readInt32];
@@ -344,7 +344,7 @@ - (NSArray *)loadMethodsOfMetaClassAtAddress:(uint64_t)address;
 {
     if (address == 0)
         return nil;
-    NSLog(@"%s, address=%016lx", _cmd, address);
+    //NSLog(@"%s, address=%016lx", _cmd, address);
     CDMachOFileDataCursor *cursor = [[CDMachOFileDataCursor alloc] initWithFile:self.machOFile address:address];
     NSParameterAssert([cursor offset] != 0);
 
@@ -357,8 +357,8 @@ - (NSArray *)loadMethodsOfMetaClassAtAddress:(uint64_t)address;
     objc2Class.reserved1  = [cursor readPtr];
     objc2Class.reserved2  = [cursor readPtr];
     objc2Class.reserved3  = [cursor readPtr];
-    NSLog(@"%016lx %016lx %016lx %016lx", objc2Class.isa, objc2Class.superclass, objc2Class.cache, objc2Class.vtable);
-    NSLog(@"%016lx %016lx %016lx %016lx", objc2Class.data, objc2Class.reserved1, objc2Class.reserved2, objc2Class.reserved3);
+    //NSLog(@"%016lx %016lx %016lx %016lx", objc2Class.isa, objc2Class.superclass, objc2Class.cache, objc2Class.vtable);
+    //NSLog(@"%016lx %016lx %016lx %016lx", objc2Class.data, objc2Class.reserved1, objc2Class.reserved2, objc2Class.reserved3);
 
     NSParameterAssert(objc2Class.data != 0);
     [cursor setAddress:objc2Class.data];
@@ -454,7 +454,7 @@ - (NSArray *)loadIvarsAtAddress:(uint64_t)address;
     if (address != 0) {
         CDMachOFileDataCursor *cursor = [[CDMachOFileDataCursor alloc] initWithFile:self.machOFile address:address];
         NSParameterAssert([cursor offset] != 0);
-        NSLog(@"ivar list data offset: %lu", [cursor offset]);
+        //NSLog(@"ivar list data offset: %lu", [cursor offset]);
 
         struct cd_objc2_list_header listHeader;
 
@@ -480,7 +480,7 @@ - (NSArray *)loadIvarsAtAddress:(uint64_t)address;
                 CDOCInstanceVariable *ivar = [[CDOCInstanceVariable alloc] initWithName:name typeString:typeString offset:offset];
                 [ivars addObject:ivar];
             } else {
-                NSLog(@"%016lx %016lx %016lx  %08x %08x", objc2Ivar.offset, objc2Ivar.name, objc2Ivar.type, objc2Ivar.alignment, objc2Ivar.size);
+                //NSLog(@"%016lx %016lx %016lx  %08x %08x", objc2Ivar.offset, objc2Ivar.name, objc2Ivar.type, objc2Ivar.alignment, objc2Ivar.size);
             }
         }
     }
@@ -495,7 +495,7 @@ - (NSArray *)protocolAddressListAtAddress:(uint64_t)address;
 
     if (address != 0) {
 
-        NSLog(@"%s, address=%016lx", _cmd, address);
+        //NSLog(@"%s, address=%016lx", _cmd, address);
 
         CDMachOFileDataCursor *cursor = [[CDMachOFileDataCursor alloc] initWithFile:self.machOFile address:address];
 

diff --git a/CDTypeLexer.m b/CDTypeLexer.m
@@ -7,7 +7,7 @@
 
 #import "NSScanner-CDExtensions.h"
 
-static BOOL debug = YES;
+static BOOL debug = NO;
 
 static NSString *CDTypeLexerStateName(CDTypeLexerState state)
 {

diff --git a/CDTypeParser.m b/CDTypeParser.m
@@ -20,7 +20,7 @@
 NSString *CDErrorKey_MethodOrVariable         = @"CDErrorKey_MethodOrVariable";
 NSString *CDErrorKey_LocalizedLongDescription = @"CDErrorKey_LocalizedLongDescription";
 
-static BOOL debug = YES;
+static BOOL debug = NO;
 
 static NSString *CDTokenDescription(int token)
 {