GNOME.org
 

[evolution-exchange] Coding style and whitespace cleanups.

commit 5c5d35f00c193226a15614f95b12db1e4b7f7d33
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Sep 11 13:28:54 2010 -0400

    Coding style and whitespace cleanups.

 addressbook/e-book-backend-exchange.c       |   24 ++++++++++++------------
 addressbook/e-book-backend-gal.c            |   10 +++++-----
 calendar/e-cal-backend-exchange.c           |    6 +++---
 camel/camel-exchange-provider.c             |    4 ++--
 eplugin/exchange-account-setup.c            |    2 +-
 eplugin/exchange-config-listener.c          |    2 +-
 eplugin/exchange-delegates-user.c           |    2 +-
 server/lib/e2k-autoconfig.c                 |    4 ++--
 server/lib/e2k-context.c                    |    2 +-
 server/lib/e2k-http-utils.c                 |    2 +-
 server/lib/e2k-utils.c                      |    2 +-
 server/storage/exchange-account.c           |    2 +-
 server/storage/exchange-hierarchy-somedav.c |    2 +-
 server/storage/exchange-hierarchy-webdav.c  |    2 +-
 server/storage/exchange-hierarchy.c         |    2 +-
 server/xntlm/xntlm.c                        |   12 ++++++------
 tools/exchange-share-config-listener.c      |    2 +-
 17 files changed, 41 insertions(+), 41 deletions(-)
---
diff --git a/addressbook/e-book-backend-exchange.c b/addressbook/e-book-backend-exchange.c
index ec61d2d..8128708 100644
--- a/addressbook/e-book-backend-exchange.c
+++ b/addressbook/e-book-backend-exchange.c
@@ -1119,19 +1119,19 @@ proppatch_address (PropMapping *prop_mapping,
 		return;
 	}
 
-	new_addrprops [ADDRPROP_POSTOFFICEBOX]		= new_address->po;
-	new_addrprops [ADDRPROP_STREET]			= new_address->street;
-	new_addrprops [ADDRPROP_CITY]			= new_address->locality;
-	new_addrprops [ADDRPROP_STATE]			= new_address->region;
-	new_addrprops [ADDRPROP_POSTALCODE]		= new_address->code;
-	new_addrprops [ADDRPROP_COUNTRY]		= new_address->country;
+	new_addrprops[ADDRPROP_POSTOFFICEBOX]		= new_address->po;
+	new_addrprops[ADDRPROP_STREET]			= new_address->street;
+	new_addrprops[ADDRPROP_CITY]			= new_address->locality;
+	new_addrprops[ADDRPROP_STATE]			= new_address->region;
+	new_addrprops[ADDRPROP_POSTALCODE]		= new_address->code;
+	new_addrprops[ADDRPROP_COUNTRY]		= new_address->country;
 	if (cur_address) {
-		cur_addrprops [ADDRPROP_POSTOFFICEBOX]	= cur_address->po;
-		cur_addrprops [ADDRPROP_STREET]		= cur_address->street;
-		cur_addrprops [ADDRPROP_CITY]		= cur_address->locality;
-		cur_addrprops [ADDRPROP_STATE]		= cur_address->region;
-		cur_addrprops [ADDRPROP_POSTALCODE]	= cur_address->code;
-		cur_addrprops [ADDRPROP_COUNTRY]	= cur_address->country;
+		cur_addrprops[ADDRPROP_POSTOFFICEBOX]	= cur_address->po;
+		cur_addrprops[ADDRPROP_STREET]		= cur_address->street;
+		cur_addrprops[ADDRPROP_CITY]		= cur_address->locality;
+		cur_addrprops[ADDRPROP_STATE]		= cur_address->region;
+		cur_addrprops[ADDRPROP_POSTALCODE]	= cur_address->code;
+		cur_addrprops[ADDRPROP_COUNTRY]	= cur_address->country;
 	}
 
 	for (i = 0; i < ADDRPROP_LAST; i++) {
diff --git a/addressbook/e-book-backend-gal.c b/addressbook/e-book-backend-gal.c
index 95c549e..353f3e6 100644
--- a/addressbook/e-book-backend-gal.c
+++ b/addressbook/e-book-backend-gal.c
@@ -1295,10 +1295,10 @@ member_populate (EContact *contact, gchar **values, EBookBackendGAL *bl, E2kOper
 
 		member_info = g_strsplit (values [i], ";", -1);
 		attr = e_vcard_attribute_new (NULL, EVC_EMAIL);
-		e_vcard_attribute_add_param_with_value (attr, e_vcard_attribute_param_new (EVC_X_DEST_CONTACT_UID), member_info [1]);
+		e_vcard_attribute_add_param_with_value (attr, e_vcard_attribute_param_new (EVC_X_DEST_CONTACT_UID), member_info[1]);
 
-		if (member_info [2]) {
-			gint len = strlen (member_info [2]);
+		if (member_info[2]) {
+			gint len = strlen (member_info[2]);
 			gchar *value;
 
 			if (member_info [2][0] == '\"' && member_info [2][len - 1] == '\"')
@@ -1309,7 +1309,7 @@ member_populate (EContact *contact, gchar **values, EBookBackendGAL *bl, E2kOper
 			e_vcard_attribute_add_value (attr, value);
 			g_free (value);
 		} else {
-			e_vcard_attribute_add_value (attr, member_info [0]);
+			e_vcard_attribute_add_value (attr, member_info[0]);
 		}
 
 		e_vcard_add_attribute (E_VCARD (contact), attr);
@@ -2638,7 +2638,7 @@ load_source (EBookBackend *backend,
 	tokens = g_strsplit (uri, ";", 2);
 	if (tokens[0]) {
 		g_free (uri);
-		uri = g_strdup (tokens [0]);
+		uri = g_strdup (tokens[0]);
 		book_name = g_strdup (tokens[1]);
 	}
 	g_strfreev (tokens);
diff --git a/calendar/e-cal-backend-exchange.c b/calendar/e-cal-backend-exchange.c
index 059cae7..23fd1ab 100644
--- a/calendar/e-cal-backend-exchange.c
+++ b/calendar/e-cal-backend-exchange.c
@@ -449,7 +449,7 @@ open_calendar (ECalBackendSync *backend, EDataCal *cal, gboolean only_if_exists,
 
 			path = strrchr (uristr, ';');
 			split_path = g_strsplit (++path, "/", -1);
-			email = split_path [0];
+			email = split_path[0];
 
 			exchange_account_scan_foreign_hierarchy (cbex->account, email);
 
@@ -1548,7 +1548,7 @@ e_cal_backend_exchange_get_sender (ECalBackendSync *backend, ECalComponent *comp
 }
 
 /* Do not internationalize */
-static const gchar *e2k_rfc822_months [] = {
+static const gchar *e2k_rfc822_months[] = {
 	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
 	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
 };
@@ -1816,7 +1816,7 @@ get_attach_file_contents (const gchar *filename, gint *length)
 			file_contents = NULL;
 			goto end;
 		}
-		file_contents [len] = '\0';
+		file_contents[len] = '\0';
 	}
 
 end :
diff --git a/camel/camel-exchange-provider.c b/camel/camel-exchange-provider.c
index 7dcfcfd..94cc0ec 100644
--- a/camel/camel-exchange-provider.c
+++ b/camel/camel-exchange-provider.c
@@ -179,8 +179,8 @@ camel_provider_module_init (void)
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
 	/* 'auth_types' is not used anywhere else, it's there just for localization of the 'al_auth' */
-	for (i = 0; auth_types [i]; i++) {
-		auth_types [i] = _(auth_types [i]);
+	for (i = 0; auth_types[i]; i++) {
+		auth_types[i] = _(auth_types[i]);
 	}
 
 	camel_provider_register (&exchange_provider);
diff --git a/eplugin/exchange-account-setup.c b/eplugin/exchange-account-setup.c
index 592c08f..59f845a 100644
--- a/eplugin/exchange-account-setup.c
+++ b/eplugin/exchange-account-setup.c
@@ -493,7 +493,7 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 
 	key = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS);
 	/* Supress the trailing slash */
-	key [strlen(key) -1] = 0;
+	key[strlen(key) -1] = 0;
 
 	/* set the mailbox before function call to let it use our, not create one */
 	exchange_params->mailbox = g_strdup (camel_url_get_param (url, "mailbox"));
diff --git a/eplugin/exchange-config-listener.c b/eplugin/exchange-config-listener.c
index b2415bf..6a0c09f 100644
--- a/eplugin/exchange-config-listener.c
+++ b/eplugin/exchange-config-listener.c
@@ -71,7 +71,7 @@ enum {
 	LAST_SIGNAL
 };
 
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
 
 #define PARENT_TYPE E_TYPE_ACCOUNT_LIST
 
diff --git a/eplugin/exchange-delegates-user.c b/eplugin/exchange-delegates-user.c
index 5408bcd..e66d012 100644
--- a/eplugin/exchange-delegates-user.c
+++ b/eplugin/exchange-delegates-user.c
@@ -74,7 +74,7 @@ enum {
 	LAST_SIGNAL
 };
 
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
 
 #define PARENT_TYPE G_TYPE_OBJECT
 static GObjectClass *parent_class = NULL;
diff --git a/server/lib/e2k-autoconfig.c b/server/lib/e2k-autoconfig.c
index 14396f3..989d58e 100644
--- a/server/lib/e2k-autoconfig.c
+++ b/server/lib/e2k-autoconfig.c
@@ -1523,8 +1523,8 @@ validate (const gchar *owa_url, gchar *user, gchar *password, ExchangeParams *ex
 
 		/* no slash at the end of path */
 		len = strlen (path);
-		while (len && path [len - 1] == '/') {
-			path [len - 1] = '\0';
+		while (len && path[len - 1] == '/') {
+			path[len - 1] = '\0';
 			len--;
 		}
 
diff --git a/server/lib/e2k-context.c b/server/lib/e2k-context.c
index f6b9dd4..fa6c87f 100644
--- a/server/lib/e2k-context.c
+++ b/server/lib/e2k-context.c
@@ -81,7 +81,7 @@ enum {
 	LAST_SIGNAL
 };
 
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
 
 struct _E2kContextPrivate {
 	SoupSession *session, *async_session;
diff --git a/server/lib/e2k-http-utils.c b/server/lib/e2k-http-utils.c
index 56da368..791ba28 100644
--- a/server/lib/e2k-http-utils.c
+++ b/server/lib/e2k-http-utils.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-extern const gchar *e2k_rfc822_months [];
+extern const gchar *e2k_rfc822_months[];
 
 /**
  * e2k_http_parse_date:
diff --git a/server/lib/e2k-utils.c b/server/lib/e2k-utils.c
index 6a94eb0..126e0e2 100644
--- a/server/lib/e2k-utils.c
+++ b/server/lib/e2k-utils.c
@@ -33,7 +33,7 @@
 #include <string.h>
 
 /* Do not internationalize */
-const gchar *e2k_rfc822_months [] = {
+const gchar *e2k_rfc822_months[] = {
 	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
 	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
 };
diff --git a/server/storage/exchange-account.c b/server/storage/exchange-account.c
index f608dce..1978b46 100644
--- a/server/storage/exchange-account.c
+++ b/server/storage/exchange-account.c
@@ -93,7 +93,7 @@ enum {
 	LAST_SIGNAL
 };
 
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
 
 #define PARENT_TYPE G_TYPE_OBJECT
 static GObjectClass *parent_class = NULL;
diff --git a/server/storage/exchange-hierarchy-somedav.c b/server/storage/exchange-hierarchy-somedav.c
index 4ed598c..e9afc01 100644
--- a/server/storage/exchange-hierarchy-somedav.c
+++ b/server/storage/exchange-hierarchy-somedav.c
@@ -47,7 +47,7 @@ enum {
 	LAST_SIGNAL
 };
 
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
 
 #define PARENT_TYPE EXCHANGE_TYPE_HIERARCHY_WEBDAV
 static ExchangeHierarchyWebDAVClass *parent_class = NULL;
diff --git a/server/storage/exchange-hierarchy-webdav.c b/server/storage/exchange-hierarchy-webdav.c
index cfed0e8..378df62 100644
--- a/server/storage/exchange-hierarchy-webdav.c
+++ b/server/storage/exchange-hierarchy-webdav.c
@@ -187,7 +187,7 @@ hierarchy_new_folder (ExchangeHierarchy *hier, EFolder *folder,
 	internal_uri = e_folder_exchange_get_internal_uri (folder);
 
 	/* This should ideally not be needed. But, this causes a problem when the
-	server has identical folder names [ internal_uri ] for folders. Very much
+	server has identical folder names[ internal_uri ] for folders. Very much
 	possible in the case of favorite folders */
 	if (g_hash_table_lookup (EXCHANGE_HIERARCHY_WEBDAV (hier)->priv->folders_by_internal_path,
 				(gchar *)e2k_uri_path (internal_uri)))
diff --git a/server/storage/exchange-hierarchy.c b/server/storage/exchange-hierarchy.c
index 77f5d6a..afc347b 100644
--- a/server/storage/exchange-hierarchy.c
+++ b/server/storage/exchange-hierarchy.c
@@ -36,7 +36,7 @@ enum {
 	LAST_SIGNAL
 };
 
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
 
 #define PARENT_TYPE G_TYPE_OBJECT
 static GObjectClass *parent_class = NULL;
diff --git a/server/xntlm/xntlm.c b/server/xntlm/xntlm.c
index def4b6d..c97db03 100644
--- a/server/xntlm/xntlm.c
+++ b/server/xntlm/xntlm.c
@@ -246,10 +246,10 @@ setup_schedule (const guchar *key_56, XNTLM_DES_KS ks)
 	/* Fix parity */
 	for (i = 0; i < 8; i++) {
 		for (c = bit = 0; bit < 8; bit++)
-			if (key [i] & (1 << bit))
+			if (key[i] & (1 << bit))
 				c++;
 		if (!(c & 1))
-			key [i] ^= 0x01;
+			key[i] ^= 0x01;
 	}
 
         xntlm_deskey (ks, key, XNTLM_DES_ENCRYPT);
@@ -264,15 +264,15 @@ static guchar LM_PASSWORD_MAGIC[] = {
 static void
 ntlm_lanmanager_hash (const gchar *password, gchar hash[21])
 {
-	guchar lm_password [15];
+	guchar lm_password[15];
 	XNTLM_DES_KS ks;
 	guint i;
 
-	for (i = 0; i < 14 && password [i]; i++)
-		lm_password [i] = toupper ((guchar) password [i]);
+	for (i = 0; i < 14 && password[i]; i++)
+		lm_password[i] = toupper ((guchar) password[i]);
 
 	for (; i < sizeof (lm_password); i++)
-		lm_password [i] = '\0';
+		lm_password[i] = '\0';
 
 	memcpy (hash, LM_PASSWORD_MAGIC, sizeof (LM_PASSWORD_MAGIC));
 
diff --git a/tools/exchange-share-config-listener.c b/tools/exchange-share-config-listener.c
index 0e787ed..7270eca 100644
--- a/tools/exchange-share-config-listener.c
+++ b/tools/exchange-share-config-listener.c
@@ -68,7 +68,7 @@ enum {
 	LAST_SIGNAL
 };
 
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
 
 #define PARENT_TYPE E_TYPE_ACCOUNT_LIST
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]