From 3f7f5681ce4058de9b10e3d80c2b2c70d34aeb30 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 5 Apr 2011 15:12:27 +0000 Subject: [PATCH] Monotone-Parent: 37e598aeb2b79c619bb99d9295a63f9ad757d3c7 Monotone-Revision: 9e635b25216d0eadcf76cf6cf3aa6e006edaeca6 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-04-05T15:12:27 Monotone-Branch: ca.inverse.sogo --- SoObjects/SOGo/SOGoCache.m | 4 +--- SoObjects/SOGo/SOGoParentFolder.m | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/SoObjects/SOGo/SOGoCache.m b/SoObjects/SOGo/SOGoCache.m index 0041eb0d4..1e2962601 100644 --- a/SoObjects/SOGo/SOGoCache.m +++ b/SoObjects/SOGo/SOGoCache.m @@ -104,8 +104,6 @@ static memcached_st *handle = NULL; if ((self = [super init])) { - memcached_return error; - cache = [[NSMutableDictionary alloc] init]; users = [[NSMutableDictionary alloc] init]; groups = [[NSMutableDictionary alloc] init]; @@ -140,7 +138,7 @@ static memcached_st *handle = NULL; servers = memcached_servers_parse([memcachedServerName UTF8String]); - error = memcached_server_push(handle, servers); + memcached_server_push(handle, servers); } } } diff --git a/SoObjects/SOGo/SOGoParentFolder.m b/SoObjects/SOGo/SOGoParentFolder.m index dafee4a8f..102816827 100644 --- a/SoObjects/SOGo/SOGoParentFolder.m +++ b/SoObjects/SOGo/SOGoParentFolder.m @@ -176,7 +176,7 @@ static SoSecurityManager *sm = nil; NSArray *attrs; NSDictionary *row; SOGoGCSFolder *folder; - NSString *key, *login; + NSString *key; NSException *error; SOGoUser *currentUser; @@ -187,7 +187,6 @@ static SoSecurityManager *sm = nil; if (!error) { currentUser = [context activeUser]; - login = [currentUser login]; attrs = [fc describeResults: NO]; while ((row = [fc fetchAttributes: attrs withZone: NULL])) @@ -470,7 +469,6 @@ static SoSecurityManager *sm = nil; - (BOOL) hasLocalSubFolderNamed: (NSString *) name { NSArray *subs; - NSException *error; NSString *currentDisplayName; int i, count; BOOL rc; @@ -478,7 +476,7 @@ static SoSecurityManager *sm = nil; rc = NO; #warning check error here - error = [self initSubFolders]; + [self initSubFolders]; subs = [subFolders allValues]; count = [subs count];