mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

avoid unnecessary memory allocation when updating the rpc access list

This commit is contained in:
Mitchell Livingston 2008-06-05 05:00:24 +00:00
parent 4d29a29003
commit 4951ba05d0
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macosx/Controller.m
View File

@ -2275,7 +2275,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
icon = [[GroupsController groups] imageForIndex: groupIndex]; icon = [[GroupsController groups] imageForIndex: groupIndex];
NSString * groupName = groupIndex != -1 ? [[GroupsController groups] nameForIndex: groupIndex] NSString * groupName = groupIndex != -1 ? [[GroupsController groups] nameForIndex: groupIndex]
: NSLocalizedString(@"None", "Groups -> Button"); : NSLocalizedString(@"None", "Groups -> Button");
toolTip = [NSString stringWithFormat: @"%@: %@", NSLocalizedString(@"Group", "Groups -> Button"), groupName]; toolTip = [NSLocalizedString(@"Group", "Groups -> Button") stringByAppendingFormat: @": %@", groupName];
} }
//tiger doesn't have built-in image scaling in buttons //tiger doesn't have built-in image scaling in buttons

1
macosx/InfoWindowController.m
View File

@ -842,7 +842,6 @@ typedef enum
{ {
if ([notification object] == fTrackerTable) if ([notification object] == fTrackerTable)
{ {
#warning disable when all selected
int numSelected = [fTrackerTable numberOfSelectedRows]; int numSelected = [fTrackerTable numberOfSelectedRows];
[fTrackerAddRemoveControl setEnabled: numSelected > 0 forSegment: TRACKER_REMOVE_TAG]; [fTrackerAddRemoveControl setEnabled: numSelected > 0 forSegment: TRACKER_REMOVE_TAG];
} }

9
macosx/PrefsController.m
View File

@ -671,14 +671,13 @@
NSString * string = [components componentsJoinedByString: @","]; NSString * string = [components componentsJoinedByString: @","];
char ** error = (char **)tr_malloc(sizeof(char **)); char * error = NULL;
if (tr_sessionSetRPCACL(fHandle, [string UTF8String], error)) if (tr_sessionSetRPCACL(fHandle, [string UTF8String], &error))
{ {
NSLog([NSString stringWithUTF8String: *error]); NSLog([NSString stringWithUTF8String: error]);
tr_free(*error);
}
tr_free(error); tr_free(error);
} }
}
- (void) addRemoveRPCIP: (id) sender - (void) addRemoveRPCIP: (id) sender
{ {

17
macosx/Torrent.m
View File

@ -52,7 +52,7 @@
- (NSString *) etaString: (int) eta; - (NSString *) etaString: (int) eta;
- (BOOL) updateAllTrackers: (NSMutableArray *) trackers; - (void) updateAllTrackers: (NSMutableArray *) trackers;
- (void) trashFile: (NSString *) path; - (void) trashFile: (NSString *) path;
@ -813,18 +813,21 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
if (!tr_httpIsValidURL([tracker UTF8String])) if (!tr_httpIsValidURL([tracker UTF8String]))
return NO; return NO;
fAddedTrackers = YES; [self updateAllTrackers: trackers];
return [self updateAllTrackers: trackers]; fAddedTrackers = YES;
return YES;
} }
- (BOOL) updateAllTrackersForRemove: (NSMutableArray *) trackers - (BOOL) updateAllTrackersForRemove: (NSMutableArray *) trackers
{ {
//check if any user-added groups //check if no user-added groups
if ([[trackers objectAtIndex: 0] intValue] != 0) if ([[trackers objectAtIndex: 0] intValue] != 0)
fAddedTrackers = NO; fAddedTrackers = NO;
return [self updateAllTrackers: trackers]; [self updateAllTrackers: trackers];
return YES;
} }
- (BOOL) hasAddedTrackers - (BOOL) hasAddedTrackers
@ -1882,7 +1885,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
} }
} }
- (BOOL) updateAllTrackers: (NSMutableArray *) trackers - (void) updateAllTrackers: (NSMutableArray *) trackers
{ {
//get count //get count
int count = 0; int count = 0;
@ -1911,8 +1914,6 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
tr_torrentSetAnnounceList(fHandle, trackerStructs, count); tr_torrentSetAnnounceList(fHandle, trackerStructs, count);
tr_free(trackerStructs); tr_free(trackerStructs);
return YES;
} }
- (void) trashFile: (NSString *) path - (void) trashFile: (NSString *) path