Changeset 41ca004 for protocols/oscar

Timestamp:

2006-05-19T07:55:53Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

68b518d6

Parents:

ac83732 (diff), 881fd4e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging from main development tree.

Location:

protocols/oscar

Files:

• oscar_util.c (modified) (2 diffs)
• service.c (modified) (2 diffs)

protocols/oscar/oscar_util.c

@@ -109 +109 @@
 
         curPtr = sn;
-        while ( (*curPtr) != (char) NULL) {
+        while ( (*curPtr) != (char) '\0') {
                 if ((*curPtr) != ' ')
                 i++;
@@ -140 +140 @@
         curPtr1 = sn1;
         curPtr2 = sn2;
-        while ( (*curPtr1 != (char) NULL) && (*curPtr2 != (char) NULL) ) {
+        while ( (*curPtr1 != (char) '\0') && (*curPtr2 != (char) '\0') ) {
                 if ( (*curPtr1 == ' ') || (*curPtr2 == ' ') ) {
                         if (*curPtr1 == ' ')

protocols/oscar/service.c

@@ -881 +881 @@
 #endif
 
+/* len can't be 0 here anyway...
                 } else if ((offset == 0x00001000) && (len == 0x00000000)) {
 
@@ -887 +888 @@
                         aimbs_put32(&fr->data, 0xe9800998);
                         aimbs_put32(&fr->data, 0xecf8427e);
-
+*/
                 } else
                         do_error_dialog(sess->aux_data, "WARNING: unknown hash request", "Gaim");