diff --git a/ABGroup.m b/ABGroup.m index 8ad2fa3..e710741 100644 --- a/ABGroup.m +++ b/ABGroup.m @@ -60,9 +60,7 @@ - (id) init - (ABSource *) source { ABRecordRef source = ABGroupCopySource( _ref ); - ABSource *sourceObj = [[[ABSource alloc] initWithABRef: source] autorelease]; - CFRelease(source); - return ( sourceObj ); + return ( [[[ABSource alloc] initWithABRef: source] autorelease] ); } - (NSArray *) allMembers diff --git a/ABRecord.m b/ABRecord.m index d93254e..114965d 100644 --- a/ABRecord.m +++ b/ABRecord.m @@ -116,9 +116,7 @@ - (id) valueForProperty: (ABPropertyID) property if ( wrapperClass != Nil ) result = [[wrapperClass alloc] initWithABRef: value]; else - result = [(id) value retain]; - - CFRelease(value); + result = (id) value; return ( [result autorelease] ); } @@ -137,11 +135,8 @@ - (BOOL) removeValueForProperty: (ABPropertyID) property error: (NSError **) err - (NSString *) compositeName { - NSString * result = [(NSString *) ABRecordCopyCompositeName( _ref ) autorelease]; - if (result == nil) { - result = @""; - } - return ( result ); + NSString * result = (NSString *) ABRecordCopyCompositeName( _ref ); + return ( [result autorelease] ); } @end