Coding style consistencies

12 files changed, 21 insertions, 21 deletions

diff --git a/Makefile.am b/Makefile.am
index ed71187..d756f64 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@
 ACLOCAL_AMFLAGS = -Im4
-EXTRA_DIST      = autogen.sh
-SUBDIRS         = facebook
+EXTRA_DIST = autogen.sh
+SUBDIRS = facebook
diff --git a/facebook/facebook-api.c b/facebook/facebook-api.c
index 735feae..cbddc32 100644
--- a/facebook/facebook-api.c
+++ b/facebook/facebook-api.c
@@ -1573,7 +1573,7 @@ fb_api_cb_mqtt_publish(FbMqtt *mqtt, const gchar *topic, GByteArray *pload,
         bytes = fb_util_zlib_inflate(pload, &err);
         FB_API_ERROR_EMIT(api, err, return);
     } else {
-        bytes = (GByteArray*) pload;
+        bytes = (GByteArray *) pload;
     }
 
     fb_util_debug_hexdump(FB_UTIL_DEBUG_LEVEL_INFO, bytes,
@@ -2077,7 +2077,7 @@ fb_api_publish(FbApi *api, const gchar *topic, const gchar *format, ...)
     msg = g_strdup_vprintf(format, ap);
     va_end(ap);
 
-    bytes = g_byte_array_new_take((guint8*) msg, strlen(msg));
+    bytes = g_byte_array_new_take((guint8 *) msg, strlen(msg));
     cytes = fb_util_zlib_deflate(bytes, &err);
 
     FB_API_ERROR_EMIT(api, err,
diff --git a/facebook/facebook-api.h b/facebook/facebook-api.h
index 59b4829..280ec60 100644
--- a/facebook/facebook-api.h
+++ b/facebook/facebook-api.h
@@ -224,7 +224,7 @@
  *
  * The #GQuark of the domain of API errors.
  */
-#define FB_API_ERROR fb_api_error_quark()
+#define FB_API_ERROR  fb_api_error_quark()
 
 typedef struct _FbApi FbApi;
 typedef struct _FbApiClass FbApiClass;
diff --git a/facebook/facebook-http.c b/facebook/facebook-http.c
index 6cd9768..cf32b25 100644
--- a/facebook/facebook-http.c
+++ b/facebook/facebook-http.c
@@ -624,7 +624,7 @@ fb_http_values_parse(FbHttpValues *values, const gchar *data, gboolean isurl)
     }
 
     if (isurl) {
-        g_free((gchar*) data);
+        g_free((gchar *) data);
     }
 
     g_strfreev(params);
diff --git a/facebook/facebook-http.h b/facebook/facebook-http.h
index 51c21ab..31da723 100644
--- a/facebook/facebook-http.h
+++ b/facebook/facebook-http.h
@@ -50,7 +50,7 @@
  *
  * The #GQuark of the domain of HTTP errors.
  */
-#define FB_HTTP_ERROR fb_http_error_quark()
+#define FB_HTTP_ERROR  fb_http_error_quark()
 
 typedef struct _FbHttp FbHttp;
 typedef struct _FbHttpClass FbHttpClass;
diff --git a/facebook/facebook-id.h b/facebook/facebook-id.h
index 92b1558..189909a 100644
--- a/facebook/facebook-id.h
+++ b/facebook/facebook-id.h
@@ -77,7 +77,7 @@
  *
  * Return: The converted #FbId value.
  */
-#define FB_ID_FROM_STR(s) g_ascii_strtoll(s, NULL, 10)
+#define FB_ID_FROM_STR(s)  g_ascii_strtoll(s, NULL, 10)
 
 /**
  * FB_ID_IS_STR:
@@ -87,7 +87,7 @@
  *
  * Return: #TRUE if the string is an #FbId, otherwise #FALSE.
  */
-#define FB_ID_IS_STR(s) fb_util_strtest(s, G_ASCII_DIGIT)
+#define FB_ID_IS_STR(s)  fb_util_strtest(s, G_ASCII_DIGIT)
 
 /**
  * FB_ID_TO_STR:
@@ -99,7 +99,7 @@
  *
  * Return: The converted string value.
  */
-#define FB_ID_TO_STR(i, s) g_sprintf(s, "%" FB_ID_FORMAT, (FbId) i)
+#define FB_ID_TO_STR(i, s)  g_sprintf(s, "%" FB_ID_FORMAT, (FbId) i)
 
 /**
  * fb_id_equal:
diff --git a/facebook/facebook-json.h b/facebook/facebook-json.h
index ba2ac85..9f32a98 100644
--- a/facebook/facebook-json.h
+++ b/facebook/facebook-json.h
@@ -43,7 +43,7 @@
  *
  * The #GQuark of the domain of JSON errors.
  */
-#define FB_JSON_ERROR fb_json_error_quark()
+#define FB_JSON_ERROR  fb_json_error_quark()
 
 typedef struct _FbJsonValues FbJsonValues;
 typedef struct _FbJsonValuesClass FbJsonValuesClass;
diff --git a/facebook/facebook-mqtt.c b/facebook/facebook-mqtt.c
index a1cc50a..07d0bf0 100644
--- a/facebook/facebook-mqtt.c
+++ b/facebook/facebook-mqtt.c
@@ -926,7 +926,7 @@ fb_mqtt_message_read_str(FbMqttMessage *msg, gchar **value)
     }
 
     if (value != NULL) {
-        *value = (gchar*) data;
+        *value = (gchar *) data;
     }
 
     return TRUE;
diff --git a/facebook/facebook-mqtt.h b/facebook/facebook-mqtt.h
index 52bb9cf..b6b9030 100644
--- a/facebook/facebook-mqtt.h
+++ b/facebook/facebook-mqtt.h
@@ -57,7 +57,7 @@
  *
  * The level of the MQTT version.
  */
-#define FB_MQTT_LEVEL 3
+#define FB_MQTT_LEVEL  3
 
 /**
  * FB_MQTT_KA:
@@ -86,14 +86,14 @@
  * The timeout, in milliseconds, to wait for a PING back from the
  * server.
  */
-#define FB_MQTT_TIMEOUT_CONN (FB_MQTT_KA * 1500)
+#define FB_MQTT_TIMEOUT_CONN  (FB_MQTT_KA * 1500)
 
 /**
  * FB_MQTT_TIMEOUT_PING:
  *
  * The timeout, in milliseconds, to send a PING to the server.
  */
-#define FB_MQTT_TIMEOUT_PING (FB_MQTT_KA * 1000)
+#define FB_MQTT_TIMEOUT_PING  (FB_MQTT_KA * 1000)
 
 /**
  * FB_MQTT_ERROR:
diff --git a/facebook/facebook-thrift.c b/facebook/facebook-thrift.c
index 65fa7c8..bde1eb1 100644
--- a/facebook/facebook-thrift.c
+++ b/facebook/facebook-thrift.c
@@ -323,7 +323,7 @@ fb_thrift_read_str(FbThrift *thft, gchar **value)
     }
 
     if (value != NULL) {
-        *value = (gchar*) data;
+        *value = (gchar *) data;
     }
 
     return TRUE;
diff --git a/facebook/facebook-util.h b/facebook/facebook-util.h
index e0b870f..8aac328 100644
--- a/facebook/facebook-util.h
+++ b/facebook/facebook-util.h
@@ -34,7 +34,7 @@
  *
  * The #GQuark of the domain of utility errors.
  */
-#define FB_UTIL_ERROR fb_util_error_quark()
+#define FB_UTIL_ERROR  fb_util_error_quark()
 
 /**
  * FbDebugLevel:
diff --git a/facebook/facebook.c b/facebook/facebook.c
index 9084332..664555e 100644
--- a/facebook/facebook.c
+++ b/facebook/facebook.c
@@ -345,7 +345,7 @@ fb_cb_api_messages(FbApi *api, GSList *msgs, gpointer data)
                 fb_api_read(api, msg->uid, FALSE);
             }
 
-            imcb_buddy_msg(ic, uid, (gchar*) msg->text, flags, 0);
+            imcb_buddy_msg(ic, uid, (gchar *) msg->text, flags, 0);
             continue;
         }
 
@@ -362,7 +362,7 @@ fb_cb_api_messages(FbApi *api, GSList *msgs, gpointer data)
                 fb_api_read(api, msg->tid, TRUE);
             }
 
-            imcb_chat_msg(gc, uid, (gchar*) msg->text, flags, 0);
+            imcb_chat_msg(gc, uid, (gchar *) msg->text, flags, 0);
         }
     }
 }
@@ -865,11 +865,11 @@ fb_cmd_account(irc_t *irc, char **args, guint required, guint *offset)
 {
     account_t *a;
     account_t *acct;
-    guint acctc;
+    guint acctc = 0;
     guint size;
     guint oset;
 
-    for (acctc= 0, a = irc->b->accounts; a != NULL; a = a->next) {
+    for (a = irc->b->accounts; a != NULL; a = a->next) {
         if ((g_ascii_strcasecmp(a->prpl->name, "facebook") == 0) &&
             (a->ic != NULL))
         {