Changeset 7869e48 for libfaim/conn.c

Timestamp:

Jan 12, 2013, 1:43:13 PM (11 years ago)

Author:

Jason Gross <jgross@mit.edu>

Children:

e3a0d71, 4485285

Parents:

4626016

git-author:

Jason Gross <jgross@mit.edu> (01/12/13 13:13:18)

git-committer:

Jason Gross <jgross@mit.edu> (01/12/13 13:43:13)

Message:

Remove trailing whitespace

This commit was made with the command sequence

    for i in $(git ls-files | tr '\n' ' ');
    do
      echo $i; sed -i s'/\s\+$//g' "$(readlink -f $i)";
    done

File:

• libfaim/conn.c (modified) (25 diffs)

libfaim/conn.c

@@ -8 +8 @@
 #define FAIM_INTERNAL
 #define FAIM_NEED_CONN_INTERNAL
-#include <aim.h> 
+#include <aim.h>
 
 #ifndef _WIN32
@@ -23 +23 @@
  * In OSCAR, every connection has a set of SNAC groups associated
  * with it.  These are the groups that you can send over this connection
- * without being guarenteed a "Not supported" SNAC error.  
- *
- * The grand theory of things says that these associations transcend 
+ * without being guarenteed a "Not supported" SNAC error.
+ *
+ * The grand theory of things says that these associations transcend
  * what libfaim calls "connection types" (conn->type).  You can probably
- * see the elegance here, but since I want to revel in it for a bit, you 
+ * see the elegance here, but since I want to revel in it for a bit, you
  * get to hear it all spelled out.
  *
@@ -33 +33 @@
  * of your modules has just given you a SNAC of the group 0x0004 to send
  * you.  Maybe an IM destined for some twit in Greenland.  So you start
- * at the top of your connection list, looking for a connection that 
+ * at the top of your connection list, looking for a connection that
  * claims to support group 0x0004.  You find one.  Why, that neat BOS
  * connection of yours can do that.  So you send it on its way.
@@ -51 +51 @@
  * that connection.  One of the first things you get from this new server
  * is a message saying that indeed it does support the group you were looking
- * for.  So you continue and send rate confirmation and all that.  
- * 
+ * for.  So you continue and send rate confirmation and all that.
+ *
  * Then you remember you had that SNAC to send, and now you have a means to
  * do it, and you do, and everyone is happy.  Except the Greenlander, who is
@@ -65 +65 @@
  * to make libfaim work that way.  It would take a fair amount of effort,
  * and probably some client API changes as well.  (Whenever I don't want
- * to do something, I just say it would change the client API.  Then I 
+ * to do something, I just say it would change the client API.  Then I
  * instantly have a couple of supporters of not doing it.)
  *
@@ -159 +159 @@
         aim_tx_cleanqueue(sess, *deadconn);
 
-        if ((*deadconn)->fd != -1) 
+        if ((*deadconn)->fd != -1)
                 aim_conn_close(*deadconn);
 
@@ -251 +251 @@
         aim_conn_t *newconn;
 
-        if (!(newconn = malloc(sizeof(aim_conn_t))))    
+        if (!(newconn = malloc(sizeof(aim_conn_t))))
                 return NULL;
         memset(newconn, 0, sizeof(aim_conn_t));
@@ -282 +282 @@
         aim_conn_t *cur, **prev;
 
-        if (!deadconn || !*deadconn)    
+        if (!deadconn || !*deadconn)
                 return;
 
@@ -307 +307 @@
  * Close (but not free) a connection.
  *
- * This leaves everything untouched except for clearing the 
+ * This leaves everything untouched except for clearing the
  * handler list and setting the fd to -1 (used to recognize
  * dead connections).  It will also remove cookies if necessary.
@@ -335 +335 @@
  * @type: Type of connection to look for
  *
- * Searches for a connection of the specified type in the 
+ * Searches for a connection of the specified type in the
  * specified session.  Returns the first connection of that
  * type found.
@@ -347 +347 @@
 
         for (cur = sess->connlist; cur; cur = cur->next) {
-                if ((cur->type == type) && 
+                if ((cur->type == type) &&
                                 !(cur->status & AIM_CONN_STATUS_INPROGRESS))
                         break;
@@ -381 +381 @@
 
 /**
- * aim_proxyconnect - An extrememly quick and dirty SOCKS5 interface. 
+ * aim_proxyconnect - An extrememly quick and dirty SOCKS5 interface.
  * @sess: Session to connect
  * @host: Host to connect to
@@ -584 +584 @@
                  * this function only gets called for some of that rendezvous
                  * crap, and not on SNAC connections, its probably okay for
-                 * now. 
+                 * now.
                  *
                  */
@@ -600 +600 @@
  * Opens a new connection to the specified dest host of specified
  * type, using the proxy settings if available.  If @host is %NULL,
- * the connection is allocated and returned, but no connection 
+ * the connection is allocated and returned, but no connection
  * is made.
  *
@@ -625 +625 @@
         }
 
-        /* 
-         * As of 23 Jul 1999, AOL now sends the port number, preceded by a 
-         * colon, in the BOS redirect.  This fatally breaks all previous 
+        /*
+         * As of 23 Jul 1999, AOL now sends the port number, preceded by a
+         * colon, in the BOS redirect.  This fatally breaks all previous
          * libfaims.  Bad, bad AOL.
          *
-         * We put this here to catch every case. 
+         * We put this here to catch every case.
          *
          */
@@ -662 +662 @@
  * @sess: Session to search
  *
- * Returns the highest valued filed descriptor of all open 
+ * Returns the highest valued filed descriptor of all open
  * connections in @sess.
  *
@@ -708 +708 @@
  * Waits for a socket with data or for timeout, whichever comes first.
  * See select(2).
- * 
+ *
  * Return codes in *status:
  *   -1  error in select() (%NULL returned)
@@ -715 +715 @@
  *    2  incoming data pending (connection with pending data returned)
  *
- */ 
+ */
 faim_export aim_conn_t *aim_select(aim_session_t *sess, struct timeval *timeout, int *status)
 {
@@ -745 +745 @@
         }
 
-        /* 
+        /*
          * If we have data waiting to be sent, return
          *
@@ -762 +762 @@
                 *status = 1;
                 return NULL;
-        } 
+        }
 
         if ((i = select(maxfd+1, &fds, &wfds, NULL, timeout))>=1) {
                 for (cur = sess->connlist; cur; cur = cur->next) {
-                        if ((FD_ISSET(cur->fd, &fds)) || 
-                                        ((cur->status & AIM_CONN_STATUS_INPROGRESS) && 
+                        if ((FD_ISSET(cur->fd, &fds)) ||
+                                        ((cur->status & AIM_CONN_STATUS_INPROGRESS) &&
                                         FD_ISSET(cur->fd, &wfds))) {
                                 *status = 2;
@@ -790 +790 @@
  *
  * This is my lame attempt at overcoming not understanding the rate
- * limiting. 
+ * limiting.
  *
  * XXX: This should really be replaced with something that scales and
@@ -817 +817 @@
  * Call this with your SOCKS5 proxy server parameters before
  * the first call to aim_newconn().  If called with all %NULL
- * args, it will clear out a previously set proxy.  
+ * args, it will clear out a previously set proxy.
  *
  * Set username and password to %NULL if not applicable.
@@ -833 +833 @@
 
         strncpy(sess->socksproxy.server, server, sizeof(sess->socksproxy.server));
-        if (username && strlen(username)) 
+        if (username && strlen(username))
                 strncpy(sess->socksproxy.username, username, sizeof(sess->socksproxy.username));
         if (password && strlen(password))
@@ -850 +850 @@
 
 /**
- * Initializes a session structure by setting the initial values 
+ * Initializes a session structure by setting the initial values
  * stuff in the aim_session_t struct.
  *
@@ -893 +893 @@
         /*
          * This must always be set.  Default to the queue-based
-         * version for back-compatibility.  
+         * version for back-compatibility.
          */
         aim_tx_setenqueue(sess, AIM_TX_QUEUED, NULL);