Drop apache 1 build-dependency

[sope] / sope-core / NGExtensions / NGDirectoryEnumerator.m

diff --git a/sope-core/NGExtensions/NGDirectoryEnumerator.m b/sope-core/NGExtensions/NGDirectoryEnumerator.m
index f3e48d3eacb527e8514f01690e809944dec05adf..1be4ae3c3a216e28ad3524f4c047e7eedfc7dd9a 100644 (file)
--- a/sope-core/NGExtensions/NGDirectoryEnumerator.m
+++ b/sope-core/NGExtensions/NGDirectoryEnumerator.m
@@ -253,7 +253,7 @@
   
   ms = [NSMutableString stringWithCapacity:128];
 
-  [ms appendFormat:@"<%@[0x%08X]: ", NSStringFromClass([self class]), self];
+  [ms appendFormat:@"<%@[0x%p]: ", NSStringFromClass([self class]), self];
 
   [ms appendFormat:@" dir='%@'", self->topPath];
   [ms appendFormat:@" cname='%@'", self->currentFileName];
@@ -267,9 +267,9 @@
 
 @implementation NGDirEntry
 
-- (id)initWithFileManager:(id)_fm path:(NSString *)_path {
+- (id)initWithFileManager:(id<NSObject, NGFileManager>)_fm path:(NSString *)_p{
   self->fileManager = [_fm retain];
-  self->path        = [_path copy];
+  self->path        = [_p copy];
   return self;
 }
 
@@ -280,6 +280,8 @@
   [super dealloc];
 }
 
+/* operations */
+
 - (NSString *)readdir {
   NSString *s;
   
@@ -292,7 +294,7 @@
   }
   
   s = [self->e nextObject];
-  //NSLog(@"readdir: %@", s);
+  // [self logWithFormat:@"readdir: %@", s];
   
   return s;
 }