diff src/protocols/oscar/rxqueue.c @ 13254:e9802db22b06

[gaim-migrate @ 15620] This is the way we clean the code, clean the code, clean the code This is the way we clean the code, clean the code, clean the code So early in the morning committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 12 Feb 2006 22:14:38 +0000
parents f260d319bbbc
children b08f8f3c9197
line wrap: on
line diff
--- a/src/protocols/oscar/rxqueue.c	Sun Feb 12 21:27:04 2006 +0000
+++ b/src/protocols/oscar/rxqueue.c	Sun Feb 12 22:14:38 2006 +0000
@@ -121,7 +121,7 @@
 	 */
 	aim_bstream_init(&hdr, hdr_raw, sizeof(hdr_raw));
 	if (aim_bstream_recv(&hdr, conn->fd, 6) < 6) {
-		aim_conn_close(conn);
+		aim_conn_close(sess, conn);
 		return -1;
 	}
 
@@ -133,7 +133,7 @@
 	 */
 	if (aimbs_get8(&hdr) != 0x2a) {
 		gaim_debug_misc("oscar", "Invalid FLAP frame received on FLAP connection!");
-		aim_conn_close(conn);
+		aim_conn_close(sess, conn);
 		return -1;
 	}
 
@@ -144,7 +144,7 @@
 }
 
 /*
- * Read a rendezvous header from conn into fr, and return the number of 
+ * Read a rendezvous header from conn into fr, and return the number of
  * bytes in the payload.
  *
  * @return -1 on error, otherwise return the length of the payload.
@@ -161,7 +161,7 @@
 	 */
 	aim_bstream_init(&hdr, hdr_raw, sizeof(hdr_raw));
 	if (aim_bstream_recv(&hdr, conn->fd, 8) < 8) {
-		aim_conn_close(conn);
+		aim_conn_close(sess, conn);
 		return -1;
 	}
 
@@ -205,7 +205,7 @@
 		return -ENOMEM;
 
 	/*
-	 * Rendezvous (client to client) connections do not speak FLAP, so this 
+	 * Rendezvous (client to client) connections do not speak FLAP, so this
 	 * function will break on them.
 	 */
 	if (conn->type == AIM_CONN_TYPE_RENDEZVOUS)
@@ -235,7 +235,7 @@
 		/* read the payload */
 		if (aim_bstream_recv(&fr->data, conn->fd, payloadlen) < payloadlen) {
 			aim_frame_destroy(fr); /* free's payload */
-			aim_conn_close(conn);
+			aim_conn_close(sess, conn);
 			return -1;
 		}
 	} else