-writeData:error: variant

karelia · Jul 10, 2011 · 90d5d87 · 90d5d87
1 parent 9e0cb3d
commit 90d5d87
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/CK2SFTPFileHandle.h b/CK2SFTPFileHandle.h
@@ -27,6 +27,7 @@
 
 - (BOOL)closeFile:(NSError **)error;
 
+- (BOOL)writeData:(NSData *)data error:(NSError **)error;
 - (NSInteger)write:(const uint8_t *)buffer maxLength:(NSUInteger)length error:(NSError **)error;
 - (NSInteger)write:(const uint8_t *)buffer maxLength:(NSUInteger)length;
 

diff --git a/CK2SFTPFileHandle.m b/CK2SFTPFileHandle.m
@@ -59,6 +59,15 @@ - (void)dealloc;
 }
 
 - (void)writeData:(NSData *)data;
+{
+    NSError *error;
+    if (![self writeData:data error:&error])
+    {
+        [NSException raise:NSFileHandleOperationException format:@"%@", [error localizedDescription]];
+    }
+}
+
+- (BOOL)writeData:(NSData *)data error:(NSError **)error;
 {
     NSUInteger offset = 0;
     NSUInteger remainder = [data length];
@@ -67,17 +76,14 @@ - (void)writeData:(NSData *)data;
     {
         const void *bytes = [data bytes];
 
-        NSError *error;
+        NSInteger written = [self write:bytes+offset maxLength:remainder error:error];
-        NSInteger written = [self write:bytes+offset maxLength:remainder error:&error];
+        if (written < 0) return NO;
-
-        if (written < 0)
-        {
-            [NSException raise:NSFileHandleOperationException format:@"%@", [error localizedDescription]];
-        }
 
         offset+=written;
         remainder-=written;
     }
+
+    return YES;
 }
 
 - (NSInteger)write:(const uint8_t *)buffer maxLength:(NSUInteger)length error:(NSError **)error;