Changeset 3345

Timestamp:

08/27/06 18:33:11 (2 years ago)

Author:

timothy

Message:

Fix many incorrect uses of strncmp.

Files:

• trunk/Models/JVChatEvent.m (modified) (2 diffs)
• trunk/Models/JVChatTranscript.m (modified) (25 diffs)
• trunk/Models/JVSQLChatTranscript.m (modified) (1 diff)

trunk/Models/JVChatEvent.m

@@ -52 +52 @@
-
-                do {
-ncmp( "message", (char *) subNode -> name, 6
+cmp( "message", (char *) subNode -> name
-                                _message = [[NSTextStorage allocWithZone:[self zone]] initWithXHTMLTree:subNode baseURL:nil defaultAttributes:nil];
-                                break;
@@ -70 +70 @@
-
-                do {
-ncmp( "message", (char *) subNode -> name, 6
+cmp( "message", (char *) subNode -> name
-                                NSMutableDictionary *properties = [NSMutableDictionary dictionary];
-                                xmlAttrPtr prop = NULL;

trunk/Models/JVChatTranscript.m

@@ -204 +204 @@
-                xmlNode *node = xmlDocGetRootElement( _xmlLog ) -> children;
-                do {
-ncmp( "envelope", (char *) node -> name, 8
+cmp( "envelope", (char *) node -> name
-                                xmlNode *subNode = node -> children;
-                                do {
-ncmp( "message", (char *) subNode -> name, 7
+cmp( "message", (char *) subNode -> name
-                                                count++;
-                                } while( subNode && ( subNode = subNode -> next ) );
@@ -223 +223 @@
-                xmlNode *node = xmlDocGetRootElement( _xmlLog ) -> children;
-                do {
-ncmp( "session", (char *) node -> name, 7
+cmp( "session", (char *) node -> name
-                                count++;
-                } while( node && ( node = node -> next ) );
@@ -237 +237 @@
-                xmlNode *node = xmlDocGetRootElement( _xmlLog ) -> children;
-                do {
-ncmp( "envelope", (char *) node -> name, 8
+cmp( "envelope", (char *) node -> name
-                                xmlNode *subNode = node -> children;
-                                do {
-ncmp( "message", (char *) subNode -> name, 7
+cmp( "message", (char *) subNode -> name
-                                                count++;
-                                } while( subNode && ( subNode = subNode -> next ) );
@@ -256 +256 @@
-                xmlNode *node = xmlDocGetRootElement( _xmlLog ) -> children;
-                do {
-ncmp( "event", (char *) node -> name, 5
+cmp( "event", (char *) node -> name
-                                count++;
-                } while( node && ( node = node -> next ) );
@@ -290 +290 @@
-                xmlNode *node = xmlDocGetRootElement( _xmlLog ) -> children;
-                do {
-ncmp( "envelope", (char *) node -> name, 8
+cmp( "envelope", (char *) node -> name
-                                xmlNode *subNode = node -> children;
-                                do {
-ncmp( "message", (char *) subNode -> name, 7
+cmp( "message", (char *) subNode -> name
-                                                if( NSLocationInRange( i, range ) ) {
-                                                        JVChatMessage *msg = [[JVChatMessage allocWithZone:nil] _initWithNode:subNode andTranscript:self];
@@ -303 +303 @@
-                                        }
-                                } while( subNode && ( subNode = subNode -> next ) );
-ncmp( "session", (char *) node -> name, 7
+cmp( "session", (char *) node -> name
-                                if( NSLocationInRange( i, range ) ) {
-                                        JVChatSession *session = [[JVChatSession allocWithZone:nil] _initWithNode:node andTranscript:self];
@@ -311 +311 @@
-
-                                if( ++i > ( range.location + range.length ) ) goto done;
-ncmp( "event", (char *) node -> name, 5
+cmp( "event", (char *) node -> name
-                                if( NSLocationInRange( i, range ) ) {
-                                        JVChatEvent *event = [[JVChatEvent allocWithZone:nil] _initWithNode:node andTranscript:self];
@@ -335 +335 @@
-                xmlNode *node = xmlGetLastChild( xmlDocGetRootElement( _xmlLog ) );
-                do {
-ncmp( "envelope", (char *) node -> name, 8
+cmp( "envelope", (char *) node -> name
-                                xmlNode *subNode = xmlGetLastChild( node );
-                                do {
-ncmp( "message", (char *) subNode -> name, 7
+cmp( "message", (char *) subNode -> name
-                                                return [[[JVChatMessage allocWithZone:nil] _initWithNode:subNode andTranscript:self] autorelease];
-                                } while( subNode && ( subNode = subNode -> prev ) );
-ncmp( "session", (char *) node -> name, 7
+cmp( "session", (char *) node -> name
-                                return [[[JVChatSession allocWithZone:nil] _initWithNode:node andTranscript:self] autorelease];
-ncmp( "event", (char *) node -> name, 5
+cmp( "event", (char *) node -> name
-                                return [[[JVChatEvent allocWithZone:nil] _initWithNode:node andTranscript:self] autorelease];
-                        }
@@ -405 +405 @@
-                xmlNode *node = xmlDocGetRootElement( _xmlLog ) -> children;
-                do {
-ncmp( "envelope", (char *) node -> name, 8
+cmp( "envelope", (char *) node -> name
-                                xmlNode *subNode = node -> children;
-                                do {
-ncmp( "message", (char *) subNode -> name, 7
+cmp( "message", (char *) subNode -> name
-                                                if( NSLocationInRange( i, range ) ) {
-                                                        if( [_messages count] > i && [[_messages objectAtIndex:i] isKindOfClass:[JVChatMessage class]] ) {
@@ -463 +463 @@
-                xmlNode *node = xmlDocGetRootElement( _xmlLog ) -> children;
-                do {
-ncmp( "envelope", (char *) node -> name, 8
+cmp( "envelope", (char *) node -> name
-                                xmlNode *subNode = node -> children;
-                                do {
-ncmp( "message", (char *) subNode -> name, 7
+cmp( "message", (char *) subNode -> name
-                                                xmlChar *prop = xmlGetProp( subNode, (xmlChar *) "id" );
-                                                if( prop && ! strcmp( (char *) prop, ident ) ) foundNode = subNode;
@@ -486 +486 @@
-
-                do {
-ncmp( "envelope", (char *) node -> name, 8
+cmp( "envelope", (char *) node -> name
-                                xmlNode *subNode = xmlGetLastChild( node );
-                                do {
-ncmp( "message", (char *) subNode -> name, 7
+cmp( "message", (char *) subNode -> name
-                                                foundNode = subNode;
-                                                break;
@@ -513 +513 @@
-
-                do {
-ncmp( "envelope", (char *) node -> name, 8
+cmp( "envelope", (char *) node -> name
-                                xmlNode *subNode = node -> children;
-                                do {
-ncmp( "message", (char *) subNode -> name, 7
+cmp( "message", (char *) subNode -> name
-                                                xmlChar *prop = xmlGetProp( subNode, (xmlChar *) "id" );
-                                                if( prop && ! strcmp( (char *) prop, ident ) ) found = YES;
@@ -547 +547 @@
-                        // check if the last node is an envelope by the same sender (and maybe source), if so append this message to that envelope
-                        xmlNode *lastChild = xmlGetLastChild( xmlDocGetRootElement( _xmlLog ) );
-ncmp( "envelope", (char *) lastChild -> name, 8
+cmp( "envelope", (char *) lastChild -> name
-                                NSString *msgSource = [[message source] absoluteString];
-
@@ -557 +557 @@
-                                        xmlNode *subNode = lastChild -> children;
-                                        do {
-ncmp( "sender", (char *) subNode -> name, 6
+cmp( "sender", (char *) subNode -> name
-                                                        NSString *identifier = [message senderIdentifier];
-                                                        NSString *nickname = [message senderNickname];
@@ -599 +599 @@
-
-                        do {
-ncmp( "sender", (char *) subNode -> name, 6
+cmp( "sender", (char *) subNode -> name
-                        } while( subNode && ( subNode = subNode -> next ) );
-
@@ -664 +664 @@
-                xmlNode *node = xmlDocGetRootElement( _xmlLog ) -> children;
-                do {
-ncmp( "session", (char *) node -> name, 7
+cmp( "session", (char *) node -> name
-                                if( NSLocationInRange( i, range ) ) {
-                                        JVChatSession *session = [[JVChatSession allocWithZone:nil] _initWithNode:node andTranscript:self];
@@ -688 +688 @@
-                xmlNode *node = xmlGetLastChild( xmlDocGetRootElement( _xmlLog ) );
-                do {
-ncmp( "session", (char *) node -> name, 7
+cmp( "session", (char *) node -> name
-                                return [[[JVChatSession allocWithZone:nil] _initWithNode:node andTranscript:self] autorelease];
-                } while( node && ( node = node -> prev ) );
@@ -729 +729 @@
-                xmlNode *node = xmlDocGetRootElement( _xmlLog ) -> children;
-                do {
-ncmp( "event", (char *) node -> name, 5
+cmp( "event", (char *) node -> name
-                                if( NSLocationInRange( i, range ) ) {
-                                        JVChatEvent *event = [[JVChatEvent allocWithZone:nil] _initWithNode:node andTranscript:self];
@@ -753 +753 @@
-                xmlNode *node = xmlGetLastChild( xmlDocGetRootElement( _xmlLog ) );
-                do {
-ncmp( "event", (char *) node -> name, 5
+cmp( "event", (char *) node -> name
-                                return [[[JVChatEvent allocWithZone:nil] _initWithNode:node andTranscript:self] autorelease];
-                } while( node && ( node = node -> prev ) );
@@ -773 +773 @@
-
-                do {
-ncmp( "event", (char *) node -> name, 5
+cmp( "event", (char *) node -> name
-                                xmlChar *prop = xmlGetProp( node, (xmlChar *) "id" );
-                                if( prop && ! strcmp( (char *) prop, ident ) ) found = YES;
@@ -978 +978 @@
-                xmlNode *node = xmlDocGetRootElement( _xmlLog ) -> children;
-                do {
-ncmp( "envelope", (char *) node -> name, 8
+cmp( "envelope", (char *) node -> name
-                                xmlNode *subNode = node -> children;
-                                BOOL removedAllMessages = YES;
-
-                                do {
-ncmp( "message", (char *) subNode -> name, 7
+cmp( "message", (char *) subNode -> name
-                                                if( total > 0 ) {
-                                                        tmp = subNode -> prev;
@@ -1004 +1004 @@
-                                        node = ( tmp ? tmp : xmlDocGetRootElement( _xmlLog ) -> children );
-                                }
-ncmp( "session", (char *) node -> name, 7
+cmp( "session", (char *) node -> name
-                                tmp = node -> prev;
-                                xmlUnlinkNode( node );
@@ -1010 +1010 @@
-                                node = ( tmp ? tmp : xmlDocGetRootElement( _xmlLog ) -> children );
-                                total--;
-ncmp( "event", (char *) node -> name, 5
+cmp( "event", (char *) node -> name
-                                tmp = node -> prev;
-                                xmlUnlinkNode( node );
@@ -1339 +1339 @@
-
-                do {
-ncmp( "message", (char *) node -> name, 7
+cmp( "message", (char *) node -> name
-                                if( node == _node ) break;
-                                _consecutiveOffset++;
@@ -1356 +1356 @@
-
-                do {
-ncmp( "sender", (char *) subNode -> name, 6
+cmp( "sender", (char *) subNode -> name
-                                xmlChar *prop = xmlNodeGetContent( subNode );
-                                id old = _senderName;

trunk/Models/JVSQLChatTranscript.m

@@ -187 +187 @@
-        NSString *identifier = [[NSString allocWithZone:nil] initWithUTF8String:fields[1]];
-
-ncmp( "message", fields[0], 7
+cmp( "message", fields[0]
-                JVChatMessage *message = [[JVChatMessage allocWithZone:nil] _initWithSQLIdentifier:identifier andTranscript:data -> transcript];
-                if( message ) [data -> results addObject:message];
-                [message release];
-ncmp( "event", fields[0], 5
+cmp( "event", fields[0]
-                JVChatEvent *event = [[JVChatEvent allocWithZone:nil] _initWithSQLIdentifier:identifier andTranscript:data -> transcript];
-                if( event ) [data -> results addObject:event];