Changeset 5ebff60 for protocols/oscar/admin.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/admin.c (modified) (12 diffs)

protocols/oscar/admin.c

@@ -28 +28 @@
                         len = aimbs_get16(bs);
 
-                        if ((type == 0x0011) || (type == 0x0004))
+                        if ((type == 0x0011) || (type == 0x0004)) {
                                 str = 1;
-
-                        if (str)
-                                val = (guint8 *)aimbs_getstr(bs, len);
-                        else
+                        }
+
+                        if (str) {
+                                val = (guint8 *) aimbs_getstr(bs, len);
+                        } else {
                                 val = aimbs_getraw(bs, len);
+                        }
 
                         /* XXX fix so its only called once for the entire packet */
-                        if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+                        if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype))) {
                                 userfunc(sess, rx, (snac->subtype == 0x0005) ? 1 : 0, perms, type, len, val, str);
+                        }
 
                         g_free(val);
@@ -49 +52 @@
 }
 
-static int accountconfirm(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
+static int accountconfirm(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac,
+                          aim_bstream_t *bs)
 {
         aim_rxcallback_t userfunc;
@@ -56 +60 @@
         status = aimbs_get16(bs);
 
-        if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
+        if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype))) {
                 return userfunc(sess, rx, status);
+        }
 
         return 0;
@@ -65 +70 @@
 {
 
-        if ((snac->subtype == 0x0003) || (snac->subtype == 0x0005))
+        if ((snac->subtype == 0x0003) || (snac->subtype == 0x0005)) {
                 return infochange(sess, mod, rx, snac, bs);
-        else if (snac->subtype == 0x0007)
+        } else if (snac->subtype == 0x0007) {
                 return accountconfirm(sess, mod, rx, snac, bs);
+        }
 
         return 0;
@@ -79 +85 @@
         mod->version = 0x0001;
         mod->toolid = AIM_TOOL_NEWWIN;
-        mod->toolversion = 0x0629; 
+        mod->toolversion = 0x0629;
         mod->flags = 0;
         strncpy(mod->name, "admin", sizeof(mod->name));
@@ -93 +99 @@
         aim_snacid_t snacid;
 
-        if (!(tx = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+4+strlen(curpw)+4+strlen(newpw))))
-                return -ENOMEM;
+        if (!(tx = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + strlen(curpw) + 4 + strlen(newpw)))) {
+                return -ENOMEM;
+        }
 
         snacid = aim_cachesnac(sess, 0x0007, 0x0004, 0x0000, NULL, 0);
@@ -100 +107 @@
 
         /* new password TLV t(0002) */
-        aim_addtlvtochain_raw(&tl, 0x0002, strlen(newpw), (guint8 *)newpw);
+        aim_addtlvtochain_raw(&tl, 0x0002, strlen(newpw), (guint8 *) newpw);
 
         /* current password TLV t(0012) */
-        aim_addtlvtochain_raw(&tl, 0x0012, strlen(curpw), (guint8 *)curpw);
+        aim_addtlvtochain_raw(&tl, 0x0012, strlen(curpw), (guint8 *) curpw);
 
         aim_writetlvchain(&tx->data, &tl);
@@ -114 +121 @@
 
 /*
- * Request account confirmation. 
+ * Request account confirmation.
  *
  * This will cause an email to be sent to the address associated with
@@ -131 +138 @@
  * The only known valid tag is 0x0011 (email address).
  *
- */ 
+ */
 int aim_admin_getinfo(aim_session_t *sess, aim_conn_t *conn, guint16 info)
 {
@@ -137 +144 @@
         aim_snacid_t snacid;
 
-        if (!(tx = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 14)))
-                return -ENOMEM;
+        if (!(tx = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 14))) {
+                return -ENOMEM;
+        }
 
         snacid = aim_cachesnac(sess, 0x0002, 0x0002, 0x0000, NULL, 0);
@@ -157 +165 @@
         aim_tlvlist_t *tl = NULL;
 
-        if (!(tx = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+2+2+strlen(newemail))))
-                return -ENOMEM;
+        if (!(tx = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 2 + 2 + strlen(newemail)))) {
+                return -ENOMEM;
+        }
 
         snacid = aim_cachesnac(sess, 0x0007, 0x0004, 0x0000, NULL, 0);
         aim_putsnac(&tx->data, 0x0007, 0x0004, 0x0000, snacid);
 
-        aim_addtlvtochain_raw(&tl, 0x0011, strlen(newemail), (guint8 *)newemail);
-        
+        aim_addtlvtochain_raw(&tl, 0x0011, strlen(newemail), (guint8 *) newemail);
+
         aim_writetlvchain(&tx->data, &tl);
         aim_freetlvchain(&tl);
-        
+
         aim_tx_enqueue(sess, tx);
 
@@ -179 +188 @@
         aim_tlvlist_t *tl = NULL;
 
-        if (!(tx = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+2+2+strlen(newnick))))
-                return -ENOMEM;
+        if (!(tx = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 2 + 2 + strlen(newnick)))) {
+                return -ENOMEM;
+        }
 
         snacid = aim_cachesnac(sess, 0x0007, 0x0004, 0x0000, NULL, 0);
         aim_putsnac(&tx->data, 0x0007, 0x0004, 0x0000, snacid);
 
-        aim_addtlvtochain_raw(&tl, 0x0001, strlen(newnick), (guint8 *)newnick);
-        
+        aim_addtlvtochain_raw(&tl, 0x0001, strlen(newnick), (guint8 *) newnick);
+
         aim_writetlvchain(&tx->data, &tl);
         aim_freetlvchain(&tl);
-        
-        aim_tx_enqueue(sess, tx);
-
-
-        return 0;
-}
+
+        aim_tx_enqueue(sess, tx);
+
+
+        return 0;
+}