Changeset 5ebff60 for protocols/oscar/txqueue.c

Timestamp:

2015-02-20T22:50:54Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

0b9daac, 3d45471, 7733b8c

Parents:

af359b4

git-author:

Indent <please@…> (19-02-15 05:47:20)

git-committer:

dequis <dx@…> (20-02-15 22:50:54)

Message:

Reindent everything to K&R style with tabs

Used uncrustify, with the configuration file in ./doc/uncrustify.cfg

Commit author set to "Indent <please@…>" so that it's easier to
skip while doing git blame.

File:

• protocols/oscar/txqueue.c (modified) (20 diffs)

protocols/oscar/txqueue.c

@@ -32 +32 @@
         }
 
-        if (!(fr = (aim_frame_t *)g_new0(aim_frame_t,1)))
+        if (!(fr = (aim_frame_t *) g_new0(aim_frame_t, 1))) {
                 return NULL;
-
-        fr->conn = conn; 
+        }
+
+        fr->conn = conn;
 
         fr->hdrtype = framing;
@@ -43 +44 @@
                 fr->hdr.flap.type = chan;
 
-        } else 
+        } else {
                 imcb_error(sess->aux_data, "unknown framing");
+        }
 
         if (datalen > 0) {
                 guint8 *data;
 
-                if (!(data = (unsigned char *)g_malloc(datalen))) {
+                if (!(data = (unsigned char *) g_malloc(datalen))) {
                         aim_frame_destroy(fr);
                         return NULL;
@@ -90 +92 @@
 
         /* see overhead note in aim_rxqueue counterpart */
-        if (!sess->queue_outgoing)
+        if (!sess->queue_outgoing) {
                 sess->queue_outgoing = fr;
-        else {
+        } else {
                 aim_frame_t *cur;
 
-                for (cur = sess->queue_outgoing; cur->next; cur = cur->next)
+                for (cur = sess->queue_outgoing; cur->next; cur = cur->next) {
                         ;
+                }
                 cur->next = fr;
         }
@@ -111 +114 @@
  * Basically the same as its __queuebased couterpart, however
  * instead of doing a list append, it just calls aim_tx_sendframe()
- * right here. 
- * 
+ * right here.
+ *
  */
 static int aim_tx_enqueue__immediate(aim_session_t *sess, aim_frame_t *fr)
@@ -123 +126 @@
         }
 
-        if (fr->hdrtype == AIM_FRAMETYPE_FLAP)
+        if (fr->hdrtype == AIM_FRAMETYPE_FLAP) {
                 fr->hdr.flap.seqnum = aim_get_next_txseqnum(fr->conn);
+        }
 
         fr->handled = 0; /* not sent yet */
@@ -137 +141 @@
 int aim_tx_setenqueue(aim_session_t *sess, int what, int (*func)(aim_session_t *, aim_frame_t *))
 {
-        
-        if (what == AIM_TX_QUEUED)
+
+        if (what == AIM_TX_QUEUED) {
                 sess->tx_enqueue = &aim_tx_enqueue__queuebased;
-        else if (what == AIM_TX_IMMEDIATE) 
+        } else if (what == AIM_TX_IMMEDIATE) {
                 sess->tx_enqueue = &aim_tx_enqueue__immediate;
-        else if (what == AIM_TX_USER) {
-                if (!func)
+        } else if (what == AIM_TX_USER) {
+                if (!func) {
                         return -EINVAL;
+                }
                 sess->tx_enqueue = func;
-        } else
+        } else {
                 return -EINVAL; /* unknown action */
 
+        }
         return 0;
 }
@@ -154 +160 @@
 int aim_tx_enqueue(aim_session_t *sess, aim_frame_t *fr)
 {
-        
+
         /*
          * If we want to send a connection thats inprogress, we have to force
@@ -160 +166 @@
          * want.
          */
-        if (fr && fr->conn && 
-                        (fr->conn->status & AIM_CONN_STATUS_INPROGRESS)) {
+        if (fr && fr->conn &&
+            (fr->conn->status & AIM_CONN_STATUS_INPROGRESS)) {
                 return aim_tx_enqueue__queuebased(sess, fr);
         }
@@ -168 +174 @@
 }
 
-/* 
+/*
  *  aim_get_next_txseqnum()
  *
@@ -180 +186 @@
 {
         flap_seqnum_t ret;
-        
+
         ret = ++conn->seqnum;
 
@@ -193 +199 @@
                 int ret;
 
-                ret = send(fd, ((unsigned char *)buf)+cur, left, 0);
-                if (ret == -1)
+                ret = send(fd, ((unsigned char *) buf) + cur, left, 0);
+                if (ret == -1) {
                         return -1;
-                else if (ret == 0)
+                } else if (ret == 0) {
                         return cur;
+                }
 
                 cur += ret;
@@ -209 +216 @@
 {
         int wrote = 0;
-        if (!bs || !conn || (count < 0))
+
+        if (!bs || !conn || (count < 0)) {
                 return -EINVAL;
-
-        if (count > aim_bstream_empty(bs))
+        }
+
+        if (count > aim_bstream_empty(bs)) {
                 count = aim_bstream_empty(bs); /* truncate to remaining space */
 
+        }
         if (count) {
                 if (count - wrote) {
                         wrote = wrote + aim_send(conn->fd, bs->data + bs->offset + wrote, count - wrote);
                 }
-                
-        }
-        
+
+        }
+
         bs->offset += wrote;
 
-        return wrote;   
+        return wrote;
 }
 
@@ -235 +245 @@
         payloadlen = aim_bstream_curpos(&fr->data);
 
-        if (!(obs_raw = g_malloc(6 + payloadlen)))
+        if (!(obs_raw = g_malloc(6 + payloadlen))) {
                 return -ENOMEM;
+        }
 
         aim_bstream_init(&obs, obs_raw, 6 + payloadlen);
@@ -252 +263 @@
         obslen = aim_bstream_curpos(&obs);
         aim_bstream_rewind(&obs);
-        if (aim_bstream_send(&obs, fr->conn, obslen) != obslen)
+        if (aim_bstream_send(&obs, fr->conn, obslen) != obslen) {
                 err = -errno;
-        
+        }
+
         g_free(obs_raw); /* XXX aim_bstream_free */
 
@@ -265 +277 @@
 int aim_tx_sendframe(aim_session_t *sess, aim_frame_t *fr)
 {
-        if (fr->hdrtype == AIM_FRAMETYPE_FLAP)
+        if (fr->hdrtype == AIM_FRAMETYPE_FLAP) {
                 return sendframe_flap(sess, fr);
+        }
         return -1;
 }
@@ -276 +289 @@
         for (cur = sess->queue_outgoing; cur; cur = cur->next) {
 
-                if (cur->handled)
-                        continue; /* already been sent */
-
-                if (cur->conn && (cur->conn->status & AIM_CONN_STATUS_INPROGRESS))
+                if (cur->handled) {
+                        continue; /* already been sent */
+
+                }
+                if (cur->conn && (cur->conn->status & AIM_CONN_STATUS_INPROGRESS)) {
                         continue;
+                }
 
                 /*
@@ -287 +302 @@
                  */
                 if ((cur->conn->lastactivity + cur->conn->forcedlatency) >= time(NULL)) {
-                        /* 
-                         * XXX should be a break! we dont want to block the 
+                        /*
+                         * XXX should be a break! we dont want to block the
                          * upper layers
                          *
@@ -309 +324 @@
 /*
  *  aim_tx_purgequeue()
- *  
- *  This is responsable for removing sent commands from the transmit 
+ *
+ *  This is responsable for removing sent commands from the transmit
  *  queue. This is not a required operation, but it of course helps
- *  reduce memory footprint at run time!  
+ *  reduce memory footprint at run time!
  *
  */
@@ -326 +341 @@
                         aim_frame_destroy(cur);
 
-                } else
+                } else {
                         prev = &cur->next;
+                }
         }
 
@@ -347 +363 @@
 
         for (cur = sess->queue_outgoing; cur; cur = cur->next) {
-                if (cur->conn == conn)
+                if (cur->conn == conn) {
                         cur->handled = 1;
+                }
         }