- Thu Aug 31 23:40:23 UTC 2000

   - Threw in aim_select modification from nicolas
   - Remove stray debugging printf in aim_tlv

diff --git a/CHANGES b/CHANGES
index 08ab5adc2ffa12c09d04afb5d0210706eabceee2..9f26b142477118abd61dc916ef74ec80937aaf4a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 
 No release numbers
 ------------------
+ - Thu Aug 31 23:40:23 UTC 2000
+   - Threw in aim_select modification from nicolas
+   - Remove stray debugging printf in aim_tlv
+
  - Mon Aug 28 03:11:15 GMT 2000
    - Adds lots of comments
    - Add AIM_CLASS_ALLUSERS constant for setgrouppermmask()

diff --git a/aim_conn.c b/aim_conn.c
index 7caef93665d9f893aa9f591e08d46a1999020c53..47073910212f68617ea9d24d055d502f6b5f3d65 100644 (file)
--- a/aim_conn.c
+++ b/aim_conn.c
@@ -323,10 +323,13 @@ struct aim_conn_t *aim_select(struct aim_session_t *sess,
        return cur;
       }
     }
-  }
+    *status = 0; /* shouldn't happen */
+  } else if ((i == -1) && (errno == EINTR)) /* treat interrupts as a timeout */
+    *status = 0;
+  else
+    *status = i; /* can be 0 or -1 */
 
   faim_mutex_unlock(&sess->connlistlock);
-  *status = i; /* may be 0 or -1 */
   return NULL;  /* no waiting or error, return */
 }
 

diff --git a/aim_tlv.c b/aim_tlv.c
index fa33aeb207820e35286b97f070fc4f4de777d945..ee260b00eb8a69ba88d8f7d8d952a78909e97551 100644 (file)
--- a/aim_tlv.c
+++ b/aim_tlv.c
@@ -49,8 +49,6 @@ struct aim_tlvlist_t *aim_readtlvchain(u_char *buf, int maxlen)
                cur->tlv->value = (u_char *)malloc(length*sizeof(u_char));
                memcpy(cur->tlv->value, buf+pos, length);
 
-               printf("faim: tlv: %x/%x\n", cur->tlv->type, cur->tlv->length);
-
                cur->next = list;
                list = cur;
              }