Merge pull request #76 from kognate/master

[FIX] Stop using deprecated -[NSString initWithContentsOfFile:]. Fix a type error in MiscMerge. (Joshua Smith)
rentzsch · Nov 22, 2011 · dc55ebb · dc55ebb
2 parents b2fd82c + 242a800
commit dc55ebb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/MiscMerge/MiscMergeExpression.m b/MiscMerge/MiscMergeExpression.m
@@ -418,7 +418,7 @@ - (id)initWithExpressions:(NSArray *)list
 {
     self = [super init];
     if ( self ) {
-        expressions = [list retain];
+        expressions = [list mutableCopy];
     }
     return self;
 }

diff --git a/MiscMerge/MiscMergeTemplate.m b/MiscMerge/MiscMergeTemplate.m
@@ -129,13 +129,25 @@ + (NSString *)defaultEndDelimiter
     return self;
 }
 
+/* helper method to load string contents of filenames */
+- (NSString *) contentsOfFileWithName:(NSString *)filename {
+    NSError *error = nil;
+    NSString *fileString = [NSString stringWithContentsOfFile:filename
+                                                     encoding:NSASCIIStringEncoding
+                                                        error:&error];
+
+    if (error != nil) {
+        NSLog(@"%@: Could not read template file %@ because %@", [self class], filename, [error localizedDescription]);   
+    }
+    return fileString;
+}
+
 /*"
  * Loads the contents of filename, then calls -#initWithString:.
 "*/
 - initWithContentsOfFile:(NSString *)filename
 {
-    NSString *fileString = [[[NSString alloc] initWithContentsOfFile:filename] autorelease];
-    if (fileString == nil) NSLog(@"%@: Could not read template file %@", [self class], filename);
+    NSString *fileString = [self contentsOfFileWithName:filename];
     return [self initWithString:fileString];
 }
 
@@ -432,8 +444,7 @@ - (void)_addCommandString:(NSString *)commandString
 "*/
 - (void)parseContentsOfFile:(NSString *)filename
 {
-    NSString *string = [[NSString alloc] initWithContentsOfFile:filename];
-    if (string == nil) NSLog(@"%@: Could not read template file %@", [self class], filename);
+    NSString *string = [self contentsOfFileWithName:filename];
     [self setFilename:filename];
     [self parseString:string];
     [string release];

diff --git a/MiscMerge/_MiscMergeIncludeCommand.m b/MiscMerge/_MiscMergeIncludeCommand.m
@@ -52,8 +52,9 @@ - (BOOL)parseFromScanner:(NSScanner *)aScanner template:(MiscMergeTemplate *)tem
 
     resolvedFilename = [template resolveTemplateFilename:filename];
 
+    NSError *error = nil;
     if ([resolvedFilename length] > 0)
-        fileString = [[[NSString alloc] initWithContentsOfFile:resolvedFilename] autorelease];
+        fileString = [NSString stringWithContentsOfFile:resolvedFilename encoding:NSASCIIStringEncoding error:&error];
 
     if (fileString)
     {
@@ -72,7 +73,7 @@ - (BOOL)parseFromScanner:(NSScanner *)aScanner template:(MiscMergeTemplate *)tem
     }
     else
     {
-        [template reportParseError:@"%@: Could not load from file '%@'", [self class], resolvedFilename];
+        [template reportParseError:@"%@: Could not load from file '%@' because %@", [self class], resolvedFilename, [error localizedDescription]];
     }
 
     return YES;