facebook: coding style consistencies
--- a/libpurple/protocols/facebook/api.c Wed Dec 23 22:32:36 2015 -0600
+++ b/libpurple/protocols/facebook/api.c Thu Dec 24 18:13:38 2015 -0500
@@ -1627,7 +1627,7 @@
bytes = fb_util_zlib_inflate(pload, &err);
FB_API_ERROR_EMIT(api, err, return);
- bytes = (GByteArray*) pload;
+ bytes = (GByteArray *) pload; fb_util_debug_hexdump(FB_UTIL_DEBUG_INFO, bytes,
@@ -2136,7 +2136,7 @@
msg = g_strdup_vprintf(format, 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,
--- a/libpurple/protocols/facebook/api.h Wed Dec 23 22:32:36 2015 -0600
+++ b/libpurple/protocols/facebook/api.h Thu Dec 24 18:13:38 2015 -0500
@@ -233,7 +233,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;
--- a/libpurple/protocols/facebook/data.c Wed Dec 23 22:32:36 2015 -0600
+++ b/libpurple/protocols/facebook/data.c Thu Dec 24 18:13:38 2015 -0500
@@ -543,7 +543,7 @@
fb_http_conns_remove(driv->cons, con);
fb_http_error_chk(res, &err);
- priv->image = (guint8*) purple_http_response_get_data(res, &priv->size);
+ priv->image = (guint8 *) purple_http_response_get_data(res, &priv->size); if (G_LIKELY(err == NULL)) {
@@ -569,7 +569,7 @@
g_hash_table_iter_init(&iter, priv->imgs);
- while (g_hash_table_iter_next(&iter, (gpointer*) &img, NULL)) {
+ while (g_hash_table_iter_next(&iter, (gpointer *) &img, NULL)) { if (fb_data_image_get_active(img)) {
@@ -581,7 +581,7 @@
g_hash_table_iter_init(&iter, priv->imgs);
- while (g_hash_table_iter_next(&iter, (gpointer*) &img, NULL)) {
+ while (g_hash_table_iter_next(&iter, (gpointer *) &img, NULL)) { if (fb_data_image_get_active(img)) {
--- a/libpurple/protocols/facebook/http.c Wed Dec 23 22:32:36 2015 -0600
+++ b/libpurple/protocols/facebook/http.c Thu Dec 24 18:13:38 2015 -0500
@@ -182,7 +182,7 @@
+ g_free((gchar *) data); --- a/libpurple/protocols/facebook/http.h Wed Dec 23 22:32:36 2015 -0600
+++ b/libpurple/protocols/facebook/http.h Thu Dec 24 18:13:38 2015 -0500
@@ -40,7 +40,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() --- a/libpurple/protocols/facebook/id.h Wed Dec 23 22:32:36 2015 -0600
+++ b/libpurple/protocols/facebook/id.h Thu Dec 24 18:13:38 2015 -0500
@@ -83,7 +83,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) @@ -93,7 +93,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) @@ -105,7 +105,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) --- a/libpurple/protocols/facebook/json.h Wed Dec 23 22:32:36 2015 -0600
+++ b/libpurple/protocols/facebook/json.h Thu Dec 24 18:13:38 2015 -0500
@@ -46,7 +46,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;
--- a/libpurple/protocols/facebook/mqtt.c Wed Dec 23 22:32:36 2015 -0600
+++ b/libpurple/protocols/facebook/mqtt.c Thu Dec 24 18:13:38 2015 -0500
@@ -962,7 +962,7 @@
- *value = (gchar*) data;
+ *value = (gchar *) data; --- a/libpurple/protocols/facebook/mqtt.h Wed Dec 23 22:32:36 2015 -0600
+++ b/libpurple/protocols/facebook/mqtt.h Thu Dec 24 18:13:38 2015 -0500
@@ -62,7 +62,7 @@
* The level of the MQTT version.
@@ -91,14 +91,14 @@
* The timeout, in milliseconds, to wait for a PING back from the
-#define FB_MQTT_TIMEOUT_CONN (FB_MQTT_KA * 1500)
+#define FB_MQTT_TIMEOUT_CONN (FB_MQTT_KA * 1500) * 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) --- a/libpurple/protocols/facebook/thrift.c Wed Dec 23 22:32:36 2015 -0600
+++ b/libpurple/protocols/facebook/thrift.c Thu Dec 24 18:13:38 2015 -0500
@@ -327,7 +327,7 @@
- *value = (gchar*) data;
+ *value = (gchar *) data; --- a/libpurple/protocols/facebook/util.h Wed Dec 23 22:32:36 2015 -0600
+++ b/libpurple/protocols/facebook/util.h Thu Dec 24 18:13:38 2015 -0500
@@ -57,7 +57,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() * FbUtilRequestBuddyFunc: