Changeset 3110

Timestamp:

01/01/06 23:41:35 (3 years ago)

Author:

timothy

Message:

Merge over to the branch.

Files:

• branches/cocoa-networking/Additions/NSDataAdditions.h (modified) (1 diff)
• branches/cocoa-networking/Additions/NSDataAdditions.m (modified) (1 diff)
• branches/cocoa-networking/Additions/NSNotificationAdditions.h (modified) (1 diff)
• branches/cocoa-networking/Additions/NSNotificationAdditions.m (modified) (4 diffs)
• branches/cocoa-networking/Additions/NSStringAdditions.m (modified) (2 diffs)

branches/cocoa-networking/Additions/NSDataAdditions.h

@@ -5 +5 @@
-- (NSString *) base64Encoding;
-- (NSString *) base64EncodingWithLineLength:(unsigned int) lineLength;
+
+- (BOOL) hasPrefix:(NSData *) prefix;
+- (BOOL) hasPrefixBytes:(void *) prefix length:(unsigned int) length;
-@end

branches/cocoa-networking/Additions/NSDataAdditions.m

@@ -144 +144 @@
-        return [NSString stringWithString:result];
-}
+
+#pragma mark -
+
+- (BOOL) hasPrefix:(NSData *) prefix {
+        unsigned int length = [prefix length];
+        if( ! prefix || ! length || [self length] < length ) return NO;
+        return ( memcmp( [self bytes], [prefix bytes], length ) == 0 );
+}
+
+- (BOOL) hasPrefixBytes:(void *) prefix length:(unsigned int) length {
+        if( ! prefix || ! length || [self length] < length ) return NO;
+        return ( memcmp( [self bytes], prefix, length ) == 0 );
+}
-@end

branches/cocoa-networking/Additions/NSNotificationAdditions.h

@@ -2 +2 @@
-- (void) postNotificationOnMainThread:(NSNotification *) notification;
-- (void) postNotificationOnMainThread:(NSNotification *) notification waitUntilDone:(BOOL) wait;
+
+- (void) postNotificationOnMainThreadWithName:(NSString *) name object:(id) object;
+- (void) postNotificationOnMainThreadWithName:(NSString *) name object:(id) object userInfo:(NSDictionary *) userInfo;
+- (void) postNotificationOnMainThreadWithName:(NSString *) name object:(id) object userInfo:(NSDictionary *) userInfo waitUntilDone:(BOOL) wait;
-@end
-

branches/cocoa-networking/Additions/NSNotificationAdditions.m

@@ -1 +1 @@
-#import "NSNotificationAdditions.h"
+#import <pthread.h>
-
-@implementation NSNotificationCenter (NSNotificationCenterAdditions)
-- (void) postNotificationOnMainThread:(NSNotification *) notification {
+        if( pthread_main_np() ) return [self postNotification:notification];
-        [self postNotificationOnMainThread:notification waitUntilDone:NO];
-}
-
-- (void) postNotificationOnMainThread:(NSNotification *) notification waitUntilDone:(BOOL) wait {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-@end
@@ -13 +50 @@
-@implementation NSNotificationQueue (NSNotificationQueueAdditions)
-- (void) enqueueNotificationOnMainThread:(NSNotification *) notification postingStyle:(NSPostingStyle) postingStyle {
+        if( pthread_main_np() ) return [self enqueueNotification:notification postingStyle:postingStyle coalesceMask:( NSNotificationCoalescingOnName | NSNotificationCoalescingOnSender ) forModes:nil];
-        [self enqueueNotificationOnMainThread:notification postingStyle:postingStyle coalesceMask:( NSNotificationCoalescingOnName | NSNotificationCoalescingOnSender ) forModes:nil];
-}
-
-- (void) enqueueNotificationOnMainThread:(NSNotification *) notification postingStyle:(NSPostingStyle) postingStyle coalesceMask:(unsigned) coalesceMask forModes:(NSArray *) modes {
+        if( pthread_main_np() ) return [self enqueueNotification:notification postingStyle:postingStyle coalesceMask:coalesceMask forModes:modes];
+
-        NSMutableDictionary *info = [[NSMutableDictionary allocWithZone:nil] init];
-        [info setObject:notification forKey:@"notification"];
@@ -23 +63 @@
-        if( modes ) [info setObject:modes forKey:@"modes"];
-
-self
+[self class]
-        [info release];
-}
-
--
++
-        NSNotification *notification = [info objectForKey:@"notification"];
-        NSPostingStyle postingStyle = [[info objectForKey:@"postingStyle"] unsignedIntValue];
@@ -33 +73 @@
-        NSArray *modes = [info objectForKey:@"modes"];
-
-[self class]
+self
-}
-@end

branches/cocoa-networking/Additions/NSStringAdditions.m

@@ -197 +197 @@
-        if( bytes ) {
-                id ret = [self initWithBytes:bytes length:strlen( bytes ) encoding:encoding];
-                if( ! ret ) ret = [self initWithCString:bytes];
-                if( ! ret ) [self release];
-                return ret;
@@ -209 +208 @@
-        if( bytes ) {
-                id ret = [self initWithBytesNoCopy:bytes length:strlen( bytes ) encoding:encoding freeWhenDone:free];
-                if( ! ret ) ret = [self initWithCString:bytes];
-                if( ! ret ) [self release];
-                return ret;