/pidgin/main: 32c1e77d0474: facebook: coding style consistencies

James Geboski jgeboski at gmail.com
Thu Dec 24 18:13:48 EST 2015


Changeset: 32c1e77d0474d5c5adac94ae96d0d660cd6b046f
Author:	 James Geboski <jgeboski at gmail.com>
Date:	 2015-12-24 18:13 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/32c1e77d0474

Description:

facebook: coding style consistencies

diffstat:

 libpurple/protocols/facebook/api.c    |  4 ++--
 libpurple/protocols/facebook/api.h    |  2 +-
 libpurple/protocols/facebook/data.c   |  6 +++---
 libpurple/protocols/facebook/http.c   |  2 +-
 libpurple/protocols/facebook/http.h   |  2 +-
 libpurple/protocols/facebook/id.h     |  6 +++---
 libpurple/protocols/facebook/json.h   |  2 +-
 libpurple/protocols/facebook/mqtt.c   |  2 +-
 libpurple/protocols/facebook/mqtt.h   |  6 +++---
 libpurple/protocols/facebook/thrift.c |  2 +-
 libpurple/protocols/facebook/util.h   |  2 +-
 11 files changed, 18 insertions(+), 18 deletions(-)

diffs (194 lines):

diff --git a/libpurple/protocols/facebook/api.c b/libpurple/protocols/facebook/api.c
--- a/libpurple/protocols/facebook/api.c
+++ b/libpurple/protocols/facebook/api.c
@@ -1627,7 +1627,7 @@ fb_api_cb_mqtt_publish(FbMqtt *mqtt, con
 		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_INFO, bytes,
@@ -2136,7 +2136,7 @@ fb_api_publish(FbApi *api, const gchar *
 	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/libpurple/protocols/facebook/api.h b/libpurple/protocols/facebook/api.h
--- a/libpurple/protocols/facebook/api.h
+++ b/libpurple/protocols/facebook/api.h
@@ -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;
diff --git a/libpurple/protocols/facebook/data.c b/libpurple/protocols/facebook/data.c
--- a/libpurple/protocols/facebook/data.c
+++ b/libpurple/protocols/facebook/data.c
@@ -543,7 +543,7 @@ fb_data_image_cb(PurpleHttpConnection *c
 	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);
 	priv->func(img, err);
 
 	if (G_LIKELY(err == NULL)) {
@@ -569,7 +569,7 @@ fb_data_image_queue(FbData *fata)
 	priv = fata->priv;
 	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)) {
 			active++;
 		}
@@ -581,7 +581,7 @@ fb_data_image_queue(FbData *fata)
 
 	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)) {
 			continue;
 		}
diff --git a/libpurple/protocols/facebook/http.c b/libpurple/protocols/facebook/http.c
--- a/libpurple/protocols/facebook/http.c
+++ b/libpurple/protocols/facebook/http.c
@@ -182,7 +182,7 @@ fb_http_params_new_parse(const gchar *da
 	}
 
 	if (isurl) {
-		g_free((gchar*) data);
+		g_free((gchar *) data);
 	}
 
 	g_strfreev(ps);
diff --git a/libpurple/protocols/facebook/http.h b/libpurple/protocols/facebook/http.h
--- a/libpurple/protocols/facebook/http.h
+++ b/libpurple/protocols/facebook/http.h
@@ -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()
 
 /**
  * FbHttpConns:
diff --git a/libpurple/protocols/facebook/id.h b/libpurple/protocols/facebook/id.h
--- a/libpurple/protocols/facebook/id.h
+++ b/libpurple/protocols/facebook/id.h
@@ -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)
 
 /**
  * FB_ID_IS_STR:
@@ -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)
 
 /**
  * FB_ID_TO_STR:
@@ -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)
 
 /**
  * fb_id_equal:
diff --git a/libpurple/protocols/facebook/json.h b/libpurple/protocols/facebook/json.h
--- a/libpurple/protocols/facebook/json.h
+++ b/libpurple/protocols/facebook/json.h
@@ -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;
diff --git a/libpurple/protocols/facebook/mqtt.c b/libpurple/protocols/facebook/mqtt.c
--- a/libpurple/protocols/facebook/mqtt.c
+++ b/libpurple/protocols/facebook/mqtt.c
@@ -962,7 +962,7 @@ fb_mqtt_message_read_str(FbMqttMessage *
 	}
 
 	if (value != NULL) {
-		*value = (gchar*) data;
+		*value = (gchar *) data;
 	}
 
 	return TRUE;
diff --git a/libpurple/protocols/facebook/mqtt.h b/libpurple/protocols/facebook/mqtt.h
--- a/libpurple/protocols/facebook/mqtt.h
+++ b/libpurple/protocols/facebook/mqtt.h
@@ -62,7 +62,7 @@
  *
  * The level of the MQTT version.
  */
-#define FB_MQTT_LEVEL 3
+#define FB_MQTT_LEVEL  3
 
 /**
  * FB_MQTT_KA:
@@ -91,14 +91,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/libpurple/protocols/facebook/thrift.c b/libpurple/protocols/facebook/thrift.c
--- a/libpurple/protocols/facebook/thrift.c
+++ b/libpurple/protocols/facebook/thrift.c
@@ -327,7 +327,7 @@ fb_thrift_read_str(FbThrift *thft, gchar
 	}
 
 	if (value != NULL) {
-		*value = (gchar*) data;
+		*value = (gchar *) data;
 	}
 
 	return TRUE;
diff --git a/libpurple/protocols/facebook/util.h b/libpurple/protocols/facebook/util.h
--- a/libpurple/protocols/facebook/util.h
+++ b/libpurple/protocols/facebook/util.h
@@ -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:



More information about the Commits mailing list