Clean up code

saagarjha · saagarjha · commit 54d93ced024b · 2016-03-10T11:24:08.000-08:00
Remove warnings
Uses runTask
diff --git a/src/Common.m b/src/Common.m
@@ -70,25 +70,15 @@
     // Set up preferences
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     
+    NSMutableDictionary *env = [NSMutableDictionary dictionaryWithDictionary:
+                                [[NSProcessInfo processInfo] environment]];
+
     // Try to find highlight location
     NSString *highlightPath = [defaults valueForKey:@"pathHL"];
     if (highlightPath == nil) {
         NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
-        NSTask *task = [[NSTask alloc] init];
-        [task setLaunchPath:@"/bin/bash"];
-        [task setArguments:@[@"-l", @"-c", @"which highlight"]];
-        NSPipe *pipe;
-        pipe = [NSPipe pipe];
-        [task setStandardOutput: pipe];
-        NSFileHandle *file;
-        file = [pipe fileHandleForReading];
-        [task launch];
-        NSData *data;
-        data = [file readDataToEndOfFile];
-        [task waitUntilExit];
+        NSData* data = runTask(@"which highlight", env, status);
         highlightPath = [[[[NSString alloc] initWithData: data encoding: NSUTF8StringEncoding] autorelease] stringByTrimmingCharactersInSet:[NSCharacterSet newlineCharacterSet]];
-        [task release];
-        [file closeFile];
         if (![highlightPath hasPrefix: @"/"] || ![highlightPath hasSuffix: @"highlight"]) { // fallback on default
             highlightPath = @"/opt/local/bin/highlight";
         }
@@ -99,8 +89,6 @@
         [userDefaults release];
     }
     
-    NSMutableDictionary *env = [NSMutableDictionary dictionaryWithDictionary:
-                                [[NSProcessInfo processInfo] environment]];
     [env addEntriesFromDictionary:[NSDictionary dictionaryWithObjectsAndKeys:
 #ifdef DEBUG
                                    @"1", @"qlcc_debug",
diff --git a/src/GeneratePreviewForURL.m b/src/GeneratePreviewForURL.m
@@ -51,8 +51,9 @@ OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview,
                                           //kUTTypePlainText,
                                           kUTTypeHTML, 
                                           properties);
-    
+#ifndef DEBUG
 done:
+#endif
     n8log(@"Finished preview in %.3f sec", -[startDate timeIntervalSinceNow] );
     [pool release];
     return noErr;
diff --git a/src/GenerateThumbnailForURL.m b/src/GenerateThumbnailForURL.m
@@ -90,7 +90,9 @@
     }
     [webView release];
     
+#ifndef DEBUG
 done:
+#endif
 #ifdef DEBUG
     n8log(@"Finished thumbnail after %.3f sec\n\n", -[startDate timeIntervalSinceNow] );
 #endif

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,9 @@`
`90`	`90`	`}`
`91`	`91`	`[webView release];`
`92`	`92`
	`93`	`+#ifndef DEBUG`
`93`	`94`	`done:`
	`95`	`+#endif`
`94`	`96`	`#ifdef DEBUG`
`95`	`97`	`n8log(@"Finished thumbnail after %.3f sec\n\n", -[startDate timeIntervalSinceNow] );`
`96`	`98`	`#endif`