syncing to master repo

Author: mikekppp

NSFileManager-Utilities.h

@@ -7,10 +7,11 @@
 #import <UIKit/UIKit.h>
 
 // Path utilities
-NSString *NSDocumentsFolder();
-NSString *NSLibraryFolder();
-NSString *NSTmpFolder();
-NSString *NSBundleFolder();
+NSString *NSDocumentsFolder(void);
+NSString *NSLibraryFolder(void);
+NSString *NSTmpFolder(void);
+NSString *NSBundleFolder(void);
+NSString *NSDCIMFolder(void);
 
 @interface NSFileManager (Utilities)
 + (NSString *) pathForItemNamed: (NSString *) fname inFolder: (NSString *) path;

NSFileManager-Utilities.m

@@ -6,6 +6,7 @@
 
 #import "NSFileManager-Utilities.h"
 
+
 NSString *NSDocumentsFolder()
 {
 	return [NSHomeDirectory() stringByAppendingPathComponent:@"Documents"];
@@ -36,7 +37,7 @@ + (NSString *) pathForItemNamed: (NSString *) fname inFolder: (NSString *) path
 {
 	NSString *file;
 	NSDirectoryEnumerator *dirEnum = [[NSFileManager defaultManager] enumeratorAtPath:path];
-	while (file = [dirEnum nextObject]) 
+	while ((file = [dirEnum nextObject])) 
 		if ([[file lastPathComponent] isEqualToString:fname]) 
 			return [path stringByAppendingPathComponent:file];
 	return nil;
@@ -57,7 +58,7 @@ + (NSArray *) filesInFolder: (NSString *) path
 	NSString *file;
 	NSMutableArray *results = [NSMutableArray array];
 	NSDirectoryEnumerator *dirEnum = [[NSFileManager defaultManager] enumeratorAtPath:path];
-	while (file = [dirEnum nextObject])
+	while ((file = [dirEnum nextObject]))
 	{
 		BOOL isDir;
 		[[NSFileManager defaultManager] fileExistsAtPath:[path stringByAppendingPathComponent:file] isDirectory: &isDir];
@@ -72,7 +73,7 @@ + (NSArray *) pathsForItemsMatchingExtension: (NSString *) ext inFolder: (NSStri
 	NSString *file;
 	NSMutableArray *results = [NSMutableArray array];
 	NSDirectoryEnumerator *dirEnum = [[NSFileManager defaultManager] enumeratorAtPath:path];
-	while (file = [dirEnum nextObject]) 
+	while ((file = [dirEnum nextObject])) 
 		if ([[file pathExtension] caseInsensitiveCompare:ext] == NSOrderedSame)
 			[results addObject:[path stringByAppendingPathComponent:file]];
 	return results;