Changeset 3517

Timestamp:

01/01/07 00:10:01 (2 years ago)

Author:

timothy

Message:

Code clean up.

Files:

• trunk/Additions/NSStringAdditions.h (modified) (1 diff)
• trunk/Additions/NSStringAdditions.m (modified) (5 diffs)
• trunk/Chat Core/MVChatPluginManager.m (modified) (1 diff)
• trunk/Chat Core/MVSILCChatConnection.m (modified) (5 diffs)

trunk/Additions/NSStringAdditions.h

@@ -4 +4 @@
-+ (NSString *) locallyUniqueString;
-
-+ (NSString *) mimeCharsetTagFromStringEncoding:(NSStringEncoding) encoding;
-+ (unsigned long) scriptTypedEncodingFromStringEncoding:(NSStringEncoding) encoding;
-+ (NSStringEncoding) stringEncodingFromScriptTypedEncoding:(unsigned long) encoding;
-
-- (id) initWithBytes:(const void *) bytes encoding:(NSStringEncoding) encoding;
-- (id) initWithBytesNoCopy:(void *) bytes encoding:(NSStringEncoding) encoding freeWhenDone:(BOOL) free;
-+ (id) stringWithBytes:(const void *) bytes encoding:(NSStringEncoding) encoding;
-+ (id) stringWithBytesNoCopy:(void *) bytes encoding:(NSStringEncoding) encoding freeWhenDone:(BOOL) free;
-
-- (const char *) bytesUsingEncoding:(NSStringEncoding) encoding allowLossyConversion:(BOOL) lossy;
-- (const char *) bytesUsingEncoding:(NSStringEncoding) encoding;
-
-- (NSString *) stringByEncodingXMLSpecialCharactersAsEntities;

trunk/Additions/NSStringAdditions.m

@@ -113 +113 @@
-}
-
-+ (NSString *) mimeCharsetTagFromStringEncoding:(NSStringEncoding) encoding {
-        switch( encoding ) {
-        default:
-        case NSASCIIStringEncoding:
-        case NSNonLossyASCIIStringEncoding:
-                return @"us-ascii";
-                break;
-        case NSUTF8StringEncoding:
-                return @"utf-8";
-                break;
-        case NSISOLatin1StringEncoding:
-                return @"iso-8859-1";
-                break;
-        case 0x80000203:
-                return @"iso-8859-3";
-                break;
-        case 0x80000208:
-                return @"iso-8859-8";
-                break;
-        case 0x80000005:
-                return @"x-mac-hebrew";
-                break;
-        case 0x80000505:
-                return @"windows-1255";
-                break;
-        case 0x8000020F:
-                return @"iso-8859-9";
-                break;
-        case NSWindowsCP1252StringEncoding:
-                return @"windows-1252";
-                break;
-        case NSISOLatin2StringEncoding:
-                return @"iso-8859-2";
-                break;
-        case 0x80000204:
-                return @"iso-8859-4";
-                break;
-        case NSWindowsCP1250StringEncoding:
-                return @"windows-1250";
-                break;
-        case 0x80000A02:
-                return @"KOI8-R";
-                break;
-        case 0x80000205:
-                return @"iso-8859-5";
-                break;
-        case NSWindowsCP1251StringEncoding:
-                return @"windows-1251";
-                break;
-        case 0x80000A01:
-                return @"Shift_JIS";
-                break;
-        case NSISO2022JPStringEncoding:
-                return @"iso-2022-jp";
-                break;
-        case NSJapaneseEUCStringEncoding:
-                return @"EUC-JP";
-                break;
-        }
-}
-
-+ (unsigned long) scriptTypedEncodingFromStringEncoding:(NSStringEncoding) encoding {
-        switch( encoding ) {
@@ -273 +212 @@
-#pragma mark -
-
-- (id) initWithBytes:(const void *) bytes encoding:(NSStringEncoding) encoding {
-        if( bytes ) {
-                id ret = [self initWithBytes:bytes length:strlen( bytes ) encoding:encoding];
-                if( ! ret ) [self release];
-                return ret;
-        }
-
-        [self release];
-        return nil;
-}
-
-- (id) initWithBytesNoCopy:(void *) bytes encoding:(NSStringEncoding) encoding freeWhenDone:(BOOL) free {
-        if( bytes ) {
-                id ret = [self initWithBytesNoCopy:bytes length:strlen( bytes ) encoding:encoding freeWhenDone:free];
-                if( ! ret ) [self release];
-                return ret;
-        }
-
-        [self release];
-        return nil;
-}
-
-+ (id) stringWithBytes:(const void *) bytes encoding:(NSStringEncoding) encoding {
-        return [[[self allocWithZone:nil] initWithBytes:bytes encoding:encoding] autorelease];
-}
-
-+ (id) stringWithBytesNoCopy:(void *) bytes encoding:(NSStringEncoding) encoding freeWhenDone:(BOOL) free {
-        return [[[self allocWithZone:nil] initWithBytesNoCopy:bytes encoding:encoding freeWhenDone:free] autorelease];
-}
-
-#pragma mark -
-
-- (const char *) bytesUsingEncoding:(NSStringEncoding) encoding allowLossyConversion:(BOOL) lossy {
-        NSMutableData *ret = [[[self dataUsingEncoding:encoding allowLossyConversion:lossy] mutableCopyWithZone:nil] autorelease];
-        [ret appendBytes:"\0" length:1];
-        return [ret bytes];
-}
-
-- (const char *) bytesUsingEncoding:(NSStringEncoding) encoding {
-        return [self bytesUsingEncoding:encoding allowLossyConversion:NO];
-}
-
-#pragma mark -
-
-- (NSString *) stringByEncodingXMLSpecialCharactersAsEntities {
-        NSMutableString *result = [self mutableCopyWithZone:nil];
@@ -385 +280 @@
-
-- (void) decodeXMLSpecialCharacterEntities {
-        [self replaceOccurrencesOfString:@"&" withString:@"&" options:NSLiteralSearch range:NSMakeRange( 0, [self length] )];
-        [self replaceOccurrencesOfString:@"&lt;" withString:@"<" options:NSLiteralSearch range:NSMakeRange( 0, [self length] )];
-        [self replaceOccurrencesOfString:@"&gt;" withString:@">" options:NSLiteralSearch range:NSMakeRange( 0, [self length] )];
-        [self replaceOccurrencesOfString:@"&quot;" withString:@"\"" options:NSLiteralSearch range:NSMakeRange( 0, [self length] )];
-        [self replaceOccurrencesOfString:@"&apos;" withString:@"'" options:NSLiteralSearch range:NSMakeRange( 0, [self length] )];
+        [self replaceOccurrencesOfString:@"&amp;" withString:@"&" options:NSLiteralSearch range:NSMakeRange( 0, [self length] )];
-}
-
@@ -396 +291 @@
-- (void) escapeCharactersInSet:(NSCharacterSet *) set {
-        NSScanner *scanner = [[NSScanner allocWithZone:nil] initWithString:self];
-
+
+
-        while( ! [scanner isAtEnd] ) {
-                [scanner scanUpToCharactersFromSet:set intoString:nil];
@@ -404 +300 @@
-                }
-        }
+
-        [scanner release];
-}

trunk/Chat Core/MVChatPluginManager.m

@@ -82 +82 @@
-                                NSBundle *bundle = [NSBundle bundleWithPath:[path stringByAppendingPathComponent:file]];
-                                if( [bundle load] && [[bundle principalClass] conformsToProtocol:@protocol( MVChatPlugin )] ) {
-[bundle principalClass] allocWithZone:nil] initWithManager:self] autorelease
+bundle principalClass] allocWithZone:nil] initWithManager:self
-                                        if( plugin ) [self addPlugin:plugin];
+                                        [plugin release];
-                                }
-                        }

trunk/Chat Core/MVSILCChatConnection.m

@@ -62 +62 @@
-
-                NSString *tmp = [NSString stringWithUTF8String:msg];
-[NSString allocWithZone:nil] initWithFormat:tmp arguments:list] autorelease
+NSString allocWithZone:nil] initWithFormat:tmp arguments:list
-                va_end( list );
-
-                [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatConnectionGotRawMessageNotification object:self userInfo:[NSDictionary dictionaryWithObjectsAndKeys:msgString, @"message", [NSNumber numberWithBool:NO], @"outbound", nil]];
+
+                [msgString release];
-        }
-}
@@ -89 +91 @@
-                if( silc_mime_parse( message, message_len, NULL, 0, type, sizeof( type ) - 1, enc, sizeof( enc ) - 1, &data, &data_len ) ) {
-                        if( strstr( enc, "base64" ) ) {
-
-
-
-
+
+
+
+
+
+
-                }
-        }
-
-NSData data
+[NSData allocWithZone:nil] init
-
-        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatRoomGotMessageNotification object:room userInfo:[NSDictionary dictionaryWithObjectsAndKeys:user, @"user", msgData, @"message", [NSString locallyUniqueString], @"identifier", mimeType, @"mimeType", [NSNumber numberWithBool:action], @"action", nil]];
+
+        [msgData release];
+        [mimeType release];
-}
-
@@ -120 +127 @@
-                if( silc_mime_parse( message, message_len, NULL, 0, type, sizeof( type ) - 1, enc, sizeof( enc ) - 1, &data, &data_len ) ) {
-                        if( strstr( enc, "base64" ) ) {
-
-
-
-
+
+
+
+
+
+
-                }
-        }
-
-NSData data
+[NSData allocWithZone:nil] init
-
-        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatConnectionGotPrivateMessageNotification object:user userInfo:[NSDictionary dictionaryWithObjectsAndKeys:msgData, @"message", [NSString locallyUniqueString], @"identifier", mimeType, @"mimeType", [NSNumber numberWithBool:action], @"action", nil]];
+
+        [msgData release];
+        [mimeType release];
-}
-
@@ -614 +626 @@
-                MVSILCChatRoom *room = (MVSILCChatRoom *)[self joinedChatRoomWithName:[NSString stringWithUTF8String:channel -> channel_name]];
-                if( ! room ) {
-[MVSILCChatRoom allocWithZone:nil] initWithChannelEntry:channel andConnection:self] autorelease
+MVSILCChatRoom allocWithZone:nil] initWithChannelEntry:channel andConnection:self
-                        [self _addJoinedRoom:room];
+                        [room release];
-                } else {
-                        [room updateWithChannelEntry:channel];
@@ -834 +847 @@
-                NSURL *url = [NSURL URLWithString:@"http://colloquy.info/ip.php"];
-                NSURLRequest *request = [NSURLRequest requestWithURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:3.];
-[NSURLConnection sendSynchronousRequest:request returningResponse:NULL error:NULL] mutableCopy] autorelease
+NSURLConnection sendSynchronousRequest:request returningResponse:NULL error:NULL] mutableCopy
-                [result appendBytes:"\0" length:1];
-
-                silc_client_send_key_agreement( client, conn, client_entry, [result bytes], NULL, 0, 60, silcgaim_buddy_keyagr_cb, a );
+
+                [result release];
-        }
-#endif