[evolution-data-server] Coding style and whitespace cleanup.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Coding style and whitespace cleanup.
- Date: Mon, 12 Jul 2010 02:29:41 +0000 (UTC)
commit e6f5be9393e73cba92257c97563faa076bc597c9
Author: Matthew Barnes <mbarnes redhat com>
Date: Sun Jul 11 13:22:13 2010 -0400
Coding style and whitespace cleanup.
addressbook/backends/file/e-book-backend-file.c | 6 +-
.../backends/groupwise/e-book-backend-groupwise.c | 10 ++--
addressbook/backends/ldap/e-book-backend-ldap.c | 68 ++++++++++----------
addressbook/backends/ldap/openldap-extract.h | 18 +++---
addressbook/backends/vcf/e-book-backend-vcf.c | 2 +-
addressbook/libebook/e-book-query.c | 8 +-
addressbook/libebook/e-contact.c | 4 +-
addressbook/libebook/e-name-western.c | 4 +-
addressbook/libebook/e-vcard.c | 6 +-
addressbook/libedata-book/e-book-backend-sexp.c | 10 ++--
addressbook/libedata-book/e-book-backend-summary.c | 8 +-
addressbook/tests/ebook/test-query.c | 2 +-
addressbook/tests/ebook/test-stress-bookviews.c | 2 +-
calendar/libedata-cal/e-cal-backend-sexp.c | 2 +-
camel/camel-folder-summary.c | 2 +-
camel/camel-folder.c | 4 +-
camel/camel-search-sql-sexp.c | 4 +-
camel/providers/groupwise/camel-groupwise-folder.c | 8 +-
camel/providers/imap/camel-imap-store-summary.c | 2 +-
camel/providers/nntp/camel-nntp-store.c | 2 +-
libedataserver/e-source-group.c | 4 +-
libedataserver/e-source-list.c | 4 +-
servers/groupwise/e-gw-connection.c | 2 +-
23 files changed, 91 insertions(+), 91 deletions(-)
---
diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c
index c558b97..270f057 100644
--- a/addressbook/backends/file/e-book-backend-file.c
+++ b/addressbook/backends/file/e-book-backend-file.c
@@ -427,7 +427,7 @@ e_book_backend_file_get_contact_list (EBookBackendSync *backend,
return;
}
- for (i = 0; i < ids->len; i ++) {
+ for (i = 0; i < ids->len; i++) {
gchar *id = g_ptr_array_index (ids, i);
string_to_dbt (id, &id_dbt);
memset (&vcard_dbt, 0, sizeof (vcard_dbt));
@@ -585,7 +585,7 @@ book_view_thread (gpointer data)
if (!ids)
goto done;
- for (i = 0; i < ids->len; i ++) {
+ for (i = 0; i < ids->len; i++) {
gchar *id = g_ptr_array_index (ids, i);
if (!e_flag_is_set (closure->running))
@@ -928,7 +928,7 @@ e_book_backend_file_get_supported_fields (EBookBackendSync *backend,
/* XXX we need a way to say "we support everything", since the
file backend does */
- for (i = 1; i < E_CONTACT_FIELD_LAST; i ++)
+ for (i = 1; i < E_CONTACT_FIELD_LAST; i++)
fields = g_list_append (fields, g_strdup (e_contact_field_name (i)));
*fields_out = fields;
diff --git a/addressbook/backends/groupwise/e-book-backend-groupwise.c b/addressbook/backends/groupwise/e-book-backend-groupwise.c
index e1dc824..32948ff 100644
--- a/addressbook/backends/groupwise/e-book-backend-groupwise.c
+++ b/addressbook/backends/groupwise/e-book-backend-groupwise.c
@@ -1930,7 +1930,7 @@ e_book_backend_groupwise_get_contact_list (EBookBackend *backend,
if (!ids)
return;
- for (i = 0; i < ids->len; i ++) {
+ for (i = 0; i < ids->len; i++) {
gchar *uid = g_ptr_array_index (ids, i);
EContact *contact =
@@ -1975,7 +1975,7 @@ e_book_backend_groupwise_get_contact_list (EBookBackend *backend,
if (!egwb->priv->is_writable) {
gint i;
- for (i = 0; i < ids->len; i ++) {
+ for (i = 0; i < ids->len; i++) {
gchar *uid = g_ptr_array_index (ids, i);
contact = e_book_backend_db_cache_get_contact (egwb->priv->file_db, uid);
vcard_list = g_list_append (vcard_list,
@@ -2100,7 +2100,7 @@ get_contacts_from_cache (EBookBackendGroupwise *ebgw,
if (enable_debug)
printf ("\nread contacts from cache for the ids found in summary\n");
- for (i = 0; i < ids->len; i ++) {
+ for (i = 0; i < ids->len; i++) {
gchar *uid;
EContact *contact;
@@ -2360,7 +2360,7 @@ book_view_thread (gpointer data)
break;
}
- count ++;
+ count++;
contact = e_contact_new ();
fill_contact_from_gw_item (contact,
E_GW_ITEM (gw_items->data),
@@ -3403,7 +3403,7 @@ e_book_backend_groupwise_get_supported_fields (EBookBackend *backend,
if (enable_debug)
printf ("\ne_book_backend_groupwise_get_supported_fields...\n");
- for (i = 0; i < G_N_ELEMENTS (mappings); i ++)
+ for (i = 0; i < G_N_ELEMENTS (mappings); i++)
fields = g_list_append (fields, g_strdup (e_contact_field_name (mappings[i].field_id)));
fields = g_list_append (fields, g_strdup (e_contact_field_name (E_CONTACT_EMAIL_2)));
fields = g_list_append (fields, g_strdup (e_contact_field_name (E_CONTACT_EMAIL_3)));
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index 96d701e..b7fde44 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -497,7 +497,7 @@ static void
add_to_supported_fields (EBookBackendLDAP *bl, gchar **attrs, GHashTable *attr_hash)
{
gint i;
- for (i = 0; attrs[i]; i ++) {
+ for (i = 0; attrs[i]; i++) {
gchar *query_prop = g_hash_table_lookup (attr_hash, attrs[i]);
if (query_prop) {
@@ -530,7 +530,7 @@ add_oc_attributes_to_supported_fields (EBookBackendLDAP *bl, LDAPObjectClass *oc
gint i;
GHashTable *attr_hash = g_hash_table_new (g_str_hash, g_str_equal);
- for (i = 0; i < G_N_ELEMENTS (prop_info); i ++)
+ for (i = 0; i < G_N_ELEMENTS (prop_info); i++)
g_hash_table_insert (attr_hash, (gpointer) prop_info[i].ldap_attr, (gchar *)e_contact_field_name (prop_info[i].field_id));
if (oc->oc_at_oids_must)
@@ -578,7 +578,7 @@ check_schema_support (EBookBackendLDAP *bl)
if (values) {
gint i;
- for (i = 0; values[i]; i ++) {
+ for (i = 0; values[i]; i++) {
gint j;
gint code;
const gchar *err;
@@ -1090,7 +1090,7 @@ ldap_op_add (LDAPOp *op, EBookBackend *backend,
g_hash_table_insert (bl->priv->id_to_op,
&op->id, op);
- bl->priv->active_ops ++;
+ bl->priv->active_ops++;
if (bl->priv->poll_timeout == -1) {
bl->priv->poll_timeout = g_timeout_add (LDAP_POLL_INTERVAL,
@@ -1283,7 +1283,7 @@ build_mods_from_contacts (EBookBackendLDAP *bl, EContact *current, EContact *new
/* we walk down the list of properties we can deal with (that
big table at the top of the file) */
- for (i = 0; i < G_N_ELEMENTS (prop_info); i ++) {
+ for (i = 0; i < G_N_ELEMENTS (prop_info); i++) {
gboolean include;
gboolean new_prop_present = FALSE;
gboolean current_prop_present = FALSE;
@@ -1636,7 +1636,7 @@ e_book_backend_ldap_create_contact (EBookBackend *backend,
printf ("Sending the following to the server as ADD\n");
printf ("Adding DN: %s\n", create_op->dn);
- for (i = 0; g_ptr_array_index(mod_array, i); i ++) {
+ for (i = 0; g_ptr_array_index(mod_array, i); i++) {
LDAPMod *mod = g_ptr_array_index(mod_array, i);
if (mod->mod_op & LDAP_MOD_DELETE)
printf ("del ");
@@ -2128,7 +2128,7 @@ modify_contact_rename_handler (LDAPOp *op, LDAPMessage *res)
gint i;
printf ("Sending the following to the server as MOD\n");
- for (i = 0; g_ptr_array_index(modify_op->mod_array, i); i ++) {
+ for (i = 0; g_ptr_array_index(modify_op->mod_array, i); i++) {
LDAPMod *mod = g_ptr_array_index(modify_op->mod_array, i);
if (mod->mod_op & LDAP_MOD_DELETE)
printf ("del ");
@@ -2703,7 +2703,7 @@ static void
email_populate(EContact *contact, gchar **values)
{
gint i;
- for (i = 0; values[i] && i < 4; i ++)
+ for (i = 0; values[i] && i < 4; i++)
e_contact_set (contact, email_ids[i], values[i]);
}
@@ -2717,7 +2717,7 @@ email_ber(EContact *contact)
if (e_contact_get (contact, E_CONTACT_IS_LIST))
return NULL;
- for (i = 0; i < 4; i ++) {
+ for (i = 0; i < 4; i++) {
emails[i] = e_contact_get (contact, email_ids[i]);
if (emails[i])
num++;
@@ -2728,11 +2728,11 @@ email_ber(EContact *contact)
result = g_new (struct berval*, num + 1);
- for (i = 0; i < num; i ++)
+ for (i = 0; i < num; i++)
result[i] = g_new (struct berval, 1);
j = 0;
- for (i = 0; i < 4; i ++) {
+ for (i = 0; i < 4; i++) {
if (emails[i]) {
result[j]->bv_val = g_strdup (emails[i]);
result[j++]->bv_len = strlen (emails[i]);
@@ -2754,7 +2754,7 @@ email_compare (EContact *contact1, EContact *contact2)
return TRUE;
*/
- for (i = 0; i < 4; i ++) {
+ for (i = 0; i < 4; i++) {
gboolean equal;
email1 = e_contact_get_const (contact1, email_ids[i]);
email2 = e_contact_get_const (contact2, email_ids[i]);
@@ -2777,7 +2777,7 @@ member_populate (EContact *contact, gchar **values)
gint i;
gchar **member_info;
- for (i = 0; values[i]; i ++) {
+ for (i = 0; values[i]; i++) {
EVCardAttribute *attr;
member_info = g_strsplit (values [i], ";", -1);
@@ -2952,11 +2952,11 @@ homephone_ber(EContact *contact)
result = g_new (struct berval*, num + 1);
- for (i = 0; i < num; i ++)
+ for (i = 0; i < num; i++)
result[i] = g_new (struct berval, 1);
j = 0;
- for (i = 0; i < 2; i ++) {
+ for (i = 0; i < 2; i++) {
if (homephones[i]) {
result[j]->bv_val = g_strdup (homephones[i]);
result[j++]->bv_len = strlen (homephones[i]);
@@ -2975,7 +2975,7 @@ homephone_compare (EContact *contact1, EContact *contact2)
const gchar *phone1, *phone2;
gint i;
- for (i = 0; i < 2; i ++) {
+ for (i = 0; i < 2; i++) {
gboolean equal;
phone1 = e_contact_get (contact1, phone_ids[i]);
phone2 = e_contact_get (contact2, phone_ids[i]);
@@ -3020,11 +3020,11 @@ business_ber(EContact *contact)
result = g_new (struct berval*, num + 1);
- for (i = 0; i < num; i ++)
+ for (i = 0; i < num; i++)
result[i] = g_new (struct berval, 1);
j = 0;
- for (i = 0; i < 2; i ++) {
+ for (i = 0; i < 2; i++) {
if (business_phones[i]) {
result[j]->bv_val = g_strdup (business_phones[i]);
result[j++]->bv_len = strlen (business_phones[i]);
@@ -3043,7 +3043,7 @@ business_compare (EContact *contact1, EContact *contact2)
const gchar *phone1, *phone2;
gint i;
- for (i = 0; i < 2; i ++) {
+ for (i = 0; i < 2; i++) {
gboolean equal;
phone1 = e_contact_get (contact1, phone_ids[i]);
phone2 = e_contact_get (contact2, phone_ids[i]);
@@ -3533,11 +3533,11 @@ rfc2254_escape(gchar *str)
gint len = strlen(str);
gint newlen = 0;
- for (i = 0; i < len; i ++) {
+ for (i = 0; i < len; i++) {
if (IS_RFC2254_CHAR(str[i]))
newlen += 3;
else
- newlen ++;
+ newlen++;
}
if (len == newlen) {
@@ -3546,7 +3546,7 @@ rfc2254_escape(gchar *str)
else {
gchar *newstr = g_malloc0 (newlen + 1);
gint j = 0;
- for (i = 0; i < len; i ++) {
+ for (i = 0; i < len; i++) {
if (IS_RFC2254_CHAR(str[i])) {
sprintf (newstr + j, "\\%02x", str[i]);
j+= 3;
@@ -3610,7 +3610,7 @@ func_and(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
strings[argc+3 - 2] = g_strdup (")");
empty = 0;
- for (i = 0; i < argc; i ++) {
+ for (i = 0; i < argc; i++) {
GList *list_head = ldap_data->list;
if (!list_head)
break;
@@ -3626,7 +3626,7 @@ func_and(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
else
ldap_data->list = g_list_prepend (ldap_data->list, g_strjoinv (" ", strings));
- for (i = 0; i < argc + 2; i ++)
+ for (i = 0; i < argc + 2; i++)
g_free (strings[i]);
g_free (strings);
@@ -3653,7 +3653,7 @@ func_or(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
strings[argc+3 - 2] = g_strdup (")");
empty = 0;
- for (i = 0; i < argc; i ++) {
+ for (i = 0; i < argc; i++) {
GList *list_head = ldap_data->list;
if (!list_head)
break;
@@ -3669,7 +3669,7 @@ func_or(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
else
ldap_data->list = g_list_prepend (ldap_data->list, g_strjoinv (" ", strings));
- for (i = 0; i < argc + 2; i ++)
+ for (i = 0; i < argc + 2; i++)
g_free (strings[i]);
g_free (strings);
@@ -3734,13 +3734,13 @@ func_contains(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer
query_length = 3; /* strlen ("(|") + strlen (")") */
- for (i = 0; i < G_N_ELEMENTS (prop_info); i ++) {
+ for (i = 0; i < G_N_ELEMENTS (prop_info); i++) {
query_length += 1 /* strlen ("(") */ + strlen(prop_info[i].ldap_attr) + strlen (match_str);
}
big_query = g_malloc0(query_length + 1);
strcat (big_query, "(|");
- for (i = 0; i < G_N_ELEMENTS (prop_info); i ++) {
+ for (i = 0; i < G_N_ELEMENTS (prop_info); i++) {
strcat (big_query, "(");
strcat (big_query, prop_info[i].ldap_attr);
strcat (big_query, match_str);
@@ -3910,13 +3910,13 @@ func_exists(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer da
query_length = 3; /* strlen ("(|") + strlen (")") */
- for (i = 0; i < G_N_ELEMENTS (prop_info); i ++) {
+ for (i = 0; i < G_N_ELEMENTS (prop_info); i++) {
query_length += 1 /* strlen ("(") */ + strlen(prop_info[i].ldap_attr) + strlen (match_str);
}
big_query = g_malloc0(query_length + 1);
strcat (big_query, "(|");
- for (i = 0; i < G_N_ELEMENTS (prop_info); i ++) {
+ for (i = 0; i < G_N_ELEMENTS (prop_info); i++) {
strcat (big_query, "(");
strcat (big_query, prop_info[i].ldap_attr);
strcat (big_query, match_str);
@@ -4007,7 +4007,7 @@ e_book_backend_ldap_build_query (EBookBackendLDAP *bl, const gchar *query)
strings[2] = data.list->data;
strings[3] = g_strdup (")");
retval = g_strjoinv (" ", strings);
- for (i = 0; i < 4; i ++)
+ for (i = 0; i < 4; i++)
g_free (strings[i]);
g_free (strings);
}
@@ -4030,7 +4030,7 @@ query_prop_to_ldap (gchar *query_prop)
{
gint i;
- for (i = 0; i < G_N_ELEMENTS (prop_info); i ++)
+ for (i = 0; i < G_N_ELEMENTS (prop_info); i++)
if (!strcmp (query_prop, e_contact_field_name (prop_info[i].field_id)))
return prop_info[i].ldap_attr;
@@ -4089,7 +4089,7 @@ build_contact_from_entry (EBookBackendLDAP *bl,
g_static_rec_mutex_lock (&eds_ldap_handler_lock);
values = ldap_get_values (bl->priv->ldap, e, attr);
g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
- for (i = 0; values[i]; i ++) {
+ for (i = 0; values[i]; i++) {
printf ("value = %s\n", values[i]);
if (!g_ascii_strcasecmp (values[i], "groupOfNames")) {
e_contact_set (contact, E_CONTACT_IS_LIST, GINT_TO_POINTER (TRUE));
@@ -4101,7 +4101,7 @@ build_contact_from_entry (EBookBackendLDAP *bl,
ldap_value_free (values);
}
else {
- for (i = 0; i < G_N_ELEMENTS (prop_info); i ++)
+ for (i = 0; i < G_N_ELEMENTS (prop_info); i++)
if (!g_ascii_strcasecmp (attr, prop_info[i].ldap_attr)) {
info = &prop_info[i];
break;
diff --git a/addressbook/backends/ldap/openldap-extract.h b/addressbook/backends/ldap/openldap-extract.h
index 8a10865..17b8e5f 100644
--- a/addressbook/backends/ldap/openldap-extract.h
+++ b/addressbook/backends/ldap/openldap-extract.h
@@ -785,8 +785,8 @@ static gsize ldap_utf8_strcspn( const gchar *str, const gchar *set )
const gchar *cstr;
const gchar *cset;
- for ( cstr = str; *cstr != '\0'; LDAP_UTF8_INCR(cstr) ) {
- for ( cset = set; *cset != '\0'; LDAP_UTF8_INCR(cset) ) {
+ for (cstr = str; *cstr != '\0'; LDAP_UTF8_INCR(cstr)) {
+ for (cset = set; *cset != '\0'; LDAP_UTF8_INCR(cset)) {
if (ldap_x_utf8_to_ucs4( cstr ) == ldap_x_utf8_to_ucs4( cset )) {
return cstr - str;
}
@@ -801,8 +801,8 @@ static gsize ldap_utf8_strspn( const gchar *str, const gchar *set )
const gchar *cstr;
const gchar *cset;
- for ( cstr = str; *cstr != '\0'; LDAP_UTF8_INCR(cstr) ) {
- for ( cset = set; ; LDAP_UTF8_INCR(cset) ) {
+ for (cstr = str; *cstr != '\0'; LDAP_UTF8_INCR(cstr)) {
+ for (cset = set; ; LDAP_UTF8_INCR(cset)) {
if (*cset == '\0') {
return cstr - str;
}
@@ -1024,7 +1024,7 @@ ldap_pvt_hex_unescape( gchar *s )
*/
gchar *p;
- for ( p = s; *s != '\0'; ++s ) {
+ for (p = s; *s != '\0'; ++s) {
if (*s == '%') {
if (*++s == '\0') {
break;
@@ -1057,7 +1057,7 @@ ldap_str2charray( const gchar *str_in, const gchar *brkstr )
}
i = 1;
- for ( s = str; *s; s++ ) {
+ for (s = str; *s; s++) {
if (ldap_utf8_strchr( brkstr, s ) != NULL) {
i++;
}
@@ -1072,14 +1072,14 @@ ldap_str2charray( const gchar *str_in, const gchar *brkstr )
i = 0;
- for ( s = ldap_utf8_strtok( str, brkstr, &lasts );
+ for (s = ldap_utf8_strtok( str, brkstr, &lasts);
s != NULL;
s = ldap_utf8_strtok( NULL, brkstr, &lasts ) )
{
res[i] = LDAP_STRDUP( s );
if (res[i] == NULL) {
- for ( --i; i >= 0; i-- ) {
+ for (--i; i >= 0; i--) {
LDAP_FREE( res[i] );
}
LDAP_FREE( res );
@@ -1398,7 +1398,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
return LDAP_URL_ERR_BADEXTS;
}
- for ( i=0; ludp->lud_exts[i] != NULL; i++ ) {
+ for (i=0; ludp->lud_exts[i] != NULL; i++) {
ldap_pvt_hex_unescape( ludp->lud_exts[i] );
if (*ludp->lud_exts[i] == '!') {
diff --git a/addressbook/backends/vcf/e-book-backend-vcf.c b/addressbook/backends/vcf/e-book-backend-vcf.c
index c07de85..ae99f03 100644
--- a/addressbook/backends/vcf/e-book-backend-vcf.c
+++ b/addressbook/backends/vcf/e-book-backend-vcf.c
@@ -576,7 +576,7 @@ e_book_backend_vcf_get_supported_fields (EBookBackendSync *backend,
/* XXX we need a way to say "we support everything", since the
vcf backend does */
- for (i = 0; i < E_CONTACT_FIELD_LAST; i ++)
+ for (i = 0; i < E_CONTACT_FIELD_LAST; i++)
fields = g_list_append (fields, (gchar *)e_contact_field_name (i));
*fields_out = fields;
diff --git a/addressbook/libebook/e-book-query.c b/addressbook/libebook/e-book-query.c
index 3c0ca88..d57c858 100644
--- a/addressbook/libebook/e-book-query.c
+++ b/addressbook/libebook/e-book-query.c
@@ -360,7 +360,7 @@ func_and(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
qs = g_new0(EBookQuery*, argc);
- for (i = 0; i < argc; i ++) {
+ for (i = 0; i < argc; i++) {
GList *list_head = *list;
if (!list_head)
break;
@@ -392,7 +392,7 @@ func_or(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
qs = g_new0(EBookQuery*, argc);
- for (i = 0; i < argc; i ++) {
+ for (i = 0; i < argc; i++) {
GList *list_head = *list;
if (!list_head)
break;
@@ -669,7 +669,7 @@ e_book_query_to_string (EBookQuery *q)
switch (q->type) {
case E_BOOK_QUERY_TYPE_AND:
g_string_append (str, "and ");
- for (i = 0; i < q->query.andor.nqs; i ++) {
+ for (i = 0; i < q->query.andor.nqs; i++) {
s = e_book_query_to_string (q->query.andor.qs[i]);
g_string_append (str, s);
g_free (s);
@@ -678,7 +678,7 @@ e_book_query_to_string (EBookQuery *q)
break;
case E_BOOK_QUERY_TYPE_OR:
g_string_append (str, "or ");
- for (i = 0; i < q->query.andor.nqs; i ++) {
+ for (i = 0; i < q->query.andor.nqs; i++) {
s = e_book_query_to_string (q->query.andor.qs[i]);
g_string_append (str, s);
g_free (s);
diff --git a/addressbook/libebook/e-contact.c b/addressbook/libebook/e-contact.c
index faeccbb..85fd67c 100644
--- a/addressbook/libebook/e-contact.c
+++ b/addressbook/libebook/e-contact.c
@@ -1350,7 +1350,7 @@ EContactField
e_contact_field_id (const gchar *field_name)
{
gint i;
- for (i = E_CONTACT_FIELD_FIRST; i < E_CONTACT_FIELD_LAST; i ++) {
+ for (i = E_CONTACT_FIELD_FIRST; i < E_CONTACT_FIELD_LAST; i++) {
if (!g_ascii_strcasecmp (field_info[i].field_name, field_name))
return field_info[i].field_id;
}
@@ -1374,7 +1374,7 @@ e_contact_field_id_from_vcard (const gchar *vcard_field)
{
gint i;
- for (i = E_CONTACT_FIELD_FIRST; i < E_CONTACT_FIELD_LAST; i ++) {
+ for (i = E_CONTACT_FIELD_FIRST; i < E_CONTACT_FIELD_LAST; i++) {
if (field_info[i].vcard_field_name == NULL)
continue;
if (field_info[i].t & E_CONTACT_FIELD_TYPE_SYNTHETIC)
diff --git a/addressbook/libebook/e-name-western.c b/addressbook/libebook/e-name-western.c
index 2c063a0..3c2c579 100644
--- a/addressbook/libebook/e-name-western.c
+++ b/addressbook/libebook/e-name-western.c
@@ -36,7 +36,7 @@ e_name_western_str_count_words (const gchar *str)
word_count = 0;
for (p = str; p != NULL; p = g_utf8_strchr (p, -1, ' ')) {
- word_count ++;
+ word_count++;
p = g_utf8_next_char (p);
}
@@ -99,7 +99,7 @@ e_name_western_get_words_at_idx (gchar *str, gint idx, gint num_words)
while (g_unichar_isspace (g_utf8_get_char (p)) && *p != '\0')
p = g_utf8_next_char (p);
- word_count ++;
+ word_count++;
}
return g_string_free (words, FALSE);
diff --git a/addressbook/libebook/e-vcard.c b/addressbook/libebook/e-vcard.c
index 2fb6244..1221020 100644
--- a/addressbook/libebook/e-vcard.c
+++ b/addressbook/libebook/e-vcard.c
@@ -205,7 +205,7 @@ read_attribute_value (EVCardAttribute *attr, gchar **p, gboolean quoted_printabl
/* read in the value */
str = g_string_new ("");
- for ( lp = skip_newline( *p, quoted_printable );
+ for (lp = skip_newline( *p, quoted_printable);
*lp != '\n' && *lp != '\r' && *lp != '\0';
lp = skip_newline( lp, quoted_printable ) ) {
@@ -312,7 +312,7 @@ read_attribute_params (EVCardAttribute *attr, gchar **p, gboolean *quoted_printa
gboolean in_quote = FALSE;
str = g_string_new ("");
- for ( lp = skip_newline( *p, *quoted_printable );
+ for (lp = skip_newline( *p, *quoted_printable);
*lp != '\n' && *lp != '\r' && *lp != '\0';
lp = skip_newline( lp, *quoted_printable ) ) {
@@ -474,7 +474,7 @@ read_attribute (gchar **p)
/* first read in the group/name */
str = g_string_new ("");
- for ( lp = skip_newline( *p, is_qp );
+ for (lp = skip_newline( *p, is_qp);
*lp != '\n' && *lp != '\r' && *lp != '\0';
lp = skip_newline( lp, is_qp ) ) {
diff --git a/addressbook/libedata-book/e-book-backend-sexp.c b/addressbook/libedata-book/e-book-backend-sexp.c
index d7892f3..492ec20 100644
--- a/addressbook/libedata-book/e-book-backend-sexp.c
+++ b/addressbook/libedata-book/e-book-backend-sexp.c
@@ -125,7 +125,7 @@ compare_email (EContact *contact, const gchar *str,
{
gint i;
- for (i = E_CONTACT_EMAIL_1; i <= E_CONTACT_EMAIL_4; i ++) {
+ for (i = E_CONTACT_EMAIL_1; i <= E_CONTACT_EMAIL_4; i++) {
const gchar *email = e_contact_get_const (contact, i);
if (email && compare(email, str))
@@ -142,7 +142,7 @@ compare_phone (EContact *contact, const gchar *str,
gint i;
gboolean rv = FALSE;
- for (i = E_CONTACT_FIRST_PHONE_ID; i <= E_CONTACT_LAST_PHONE_ID; i ++) {
+ for (i = E_CONTACT_FIRST_PHONE_ID; i <= E_CONTACT_LAST_PHONE_ID; i++) {
gchar *phone = e_contact_get (contact, i);
rv = phone && compare(phone, str);
@@ -188,7 +188,7 @@ compare_address (EContact *contact, const gchar *str,
gint i;
gboolean rv = FALSE;
- for (i = E_CONTACT_FIRST_ADDRESS_ID; i <= E_CONTACT_LAST_ADDRESS_ID; i ++) {
+ for (i = E_CONTACT_FIRST_ADDRESS_ID; i <= E_CONTACT_LAST_ADDRESS_ID; i++) {
EContactAddress *address = e_contact_get (contact, i);
if (address) {
rv = (address->po && compare(address->po, str)) ||
@@ -309,7 +309,7 @@ entry_compare(SearchContext *ctx, struct _ESExp *f,
propname = argv[0]->value.string;
any_field = !strcmp(propname, "x-evolution-any-field");
- for (i = 0; i < G_N_ELEMENTS (prop_info_table); i ++) {
+ for (i = 0; i < G_N_ELEMENTS (prop_info_table); i++) {
if (any_field
|| !strcmp (prop_info_table[i].query_prop, propname)) {
saw_any = TRUE;
@@ -694,7 +694,7 @@ func_exists(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer da
propname = argv[0]->value.string;
- for (i = 0; i < G_N_ELEMENTS (prop_info_table); i ++) {
+ for (i = 0; i < G_N_ELEMENTS (prop_info_table); i++) {
if (!strcmp (prop_info_table[i].query_prop, propname)) {
saw_any = TRUE;
info = &prop_info_table[i];
diff --git a/addressbook/libedata-book/e-book-backend-summary.c b/addressbook/libedata-book/e-book-backend-summary.c
index 0d4d4bb..af32e42 100644
--- a/addressbook/libedata-book/e-book-backend-summary.c
+++ b/addressbook/libedata-book/e-book-backend-summary.c
@@ -513,7 +513,7 @@ e_book_backend_summary_load (EBookBackendSummary *summary)
if (!e_book_backend_summary_open (summary))
return FALSE;
- for (i = 0; i < summary->priv->num_items; i ++) {
+ for (i = 0; i < summary->priv->num_items; i++) {
if (!e_book_backend_summary_load_item (summary, &new_item)) {
g_warning ("error while reading summary item");
clear_items (summary);
@@ -684,7 +684,7 @@ e_book_backend_summary_save (EBookBackendSummary *summary)
goto lose;
}
- for (i = 0; i < summary->priv->items->len; i ++) {
+ for (i = 0; i < summary->priv->items->len; i++) {
EBookBackendSummaryItem *item = g_ptr_array_index (summary->priv->items, i);
if (!e_book_backend_summary_save_item (summary, fp, item)) {
g_warning ("failed to write an item to new summary file, errno = %d", errno);
@@ -1009,7 +1009,7 @@ do_compare (EBookBackendSummary *summary, struct _ESExp *f, gint argc,
&& argv[0]->type == ESEXP_RES_STRING
&& argv[1]->type == ESEXP_RES_STRING) {
- for (i = 0; i < summary->priv->items->len; i ++) {
+ for (i = 0; i < summary->priv->items->len; i++) {
EBookBackendSummaryItem *item = g_ptr_array_index (summary->priv->items, i);
if (!strcmp (argv[0]->value.string, "full_name")) {
gchar *given = item->given_name;
@@ -1214,7 +1214,7 @@ e_book_backend_summary_search (EBookBackendSummary *summary, const gchar *query)
GPtrArray *ptrarray = r->value.ptrarray;
gint i;
- for (i = 0; i < ptrarray->len; i ++)
+ for (i = 0; i < ptrarray->len; i++)
g_ptr_array_add (retval, g_ptr_array_index (ptrarray, i));
}
diff --git a/addressbook/tests/ebook/test-query.c b/addressbook/tests/ebook/test-query.c
index daa0616..33c6143 100644
--- a/addressbook/tests/ebook/test-query.c
+++ b/addressbook/tests/ebook/test-query.c
@@ -17,7 +17,7 @@ main (gint argc, gchar **argv)
gint i;
gboolean failure = FALSE;
- for (i = 0; i < G_N_ELEMENTS (queries); i ++) {
+ for (i = 0; i < G_N_ELEMENTS (queries); i++) {
EBookQuery *query = e_book_query_from_string (queries[i]);
gchar *str;
diff --git a/addressbook/tests/ebook/test-stress-bookviews.c b/addressbook/tests/ebook/test-stress-bookviews.c
index ffad969..4f6e871 100644
--- a/addressbook/tests/ebook/test-stress-bookviews.c
+++ b/addressbook/tests/ebook/test-stress-bookviews.c
@@ -79,7 +79,7 @@ main (gint argc, gchar **argv)
query = e_book_query_any_field_contains ("");
- for (i = 0; i < 500; i ++) {
+ for (i = 0; i < 500; i++) {
status = e_book_get_book_view (book, query, NULL, -1, &new_view, NULL);
g_signal_connect (new_view, "contacts_added", G_CALLBACK (contacts_added), NULL);
diff --git a/calendar/libedata-cal/e-cal-backend-sexp.c b/calendar/libedata-cal/e-cal-backend-sexp.c
index 17d2f5f..f6fa9a6 100644
--- a/calendar/libedata-cal/e-cal-backend-sexp.c
+++ b/calendar/libedata-cal/e-cal-backend-sexp.c
@@ -1189,7 +1189,7 @@ entry_compare(SearchContext *ctx, struct _ESExp *f,
propname = argv[0]->value.string;
any_field = !strcmp(propname, "x-evolution-any-field");
- for (i = 0; i < G_N_ELEMENTS (prop_info_table); i ++) {
+ for (i = 0; i < G_N_ELEMENTS (prop_info_table); i++) {
if (any_field
|| !strcmp (prop_info_table[i].query_prop, propname)) {
info = &prop_info_table[i];
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index c8203a9..7092bb4 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -2155,7 +2155,7 @@ save_to_db_cb (gpointer key, gpointer value, gpointer data)
camel_db_start_in_memory_transactions (cdb, error);
args->progress = 0;
} else {
- args->progress ++;
+ args->progress++;
}
}
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index 874c831..ae3c21f 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -126,7 +126,7 @@ filter_filter (CamelSession *session, CamelSessionThreadMsg *tmsg)
"Learning new spam messages in '%s'",
m->junk->len), full_name);
- for (i = 0; i < m->junk->len; i ++) {
+ for (i = 0; i < m->junk->len; i++) {
CamelMimeMessage *msg = camel_folder_get_message (m->folder, m->junk->pdata[i], NULL);
gint pc = 100 * i / m->junk->len;
@@ -147,7 +147,7 @@ filter_filter (CamelSession *session, CamelSessionThreadMsg *tmsg)
"Learning new ham message in '%s'",
"Learning new ham messages in '%s'",
m->notjunk->len), full_name);
- for (i = 0; i < m->notjunk->len; i ++) {
+ for (i = 0; i < m->notjunk->len; i++) {
CamelMimeMessage *msg = camel_folder_get_message (m->folder, m->notjunk->pdata[i], NULL);
gint pc = 100 * i / m->notjunk->len;
diff --git a/camel/camel-search-sql-sexp.c b/camel/camel-search-sql-sexp.c
index a33fcb8..86b7352 100644
--- a/camel/camel-search-sql-sexp.c
+++ b/camel/camel-search-sql-sexp.c
@@ -87,7 +87,7 @@ func_and(ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer data)
d(printf("executing and: %d", argc));
string = g_string_new("( ");
- for (i = 0; i < argc; i ++) {
+ for (i = 0; i < argc; i++) {
r1 = e_sexp_term_eval(f, argv[i]);
if (r1->type != ESEXP_RES_STRING) {
@@ -120,7 +120,7 @@ func_or(ESExp *f, gint argc, struct _ESExpTerm **argv, gpointer data)
d(printf("executing or: %d", argc));
string = g_string_new("( ");
- for (i = 0; i < argc; i ++) {
+ for (i = 0; i < argc; i++) {
r1 = e_sexp_term_eval(f, argv[i]);
if (r1->type != ESEXP_RES_STRING) {
diff --git a/camel/providers/groupwise/camel-groupwise-folder.c b/camel/providers/groupwise/camel-groupwise-folder.c
index d5090b5..c5bf64d 100644
--- a/camel/providers/groupwise/camel-groupwise-folder.c
+++ b/camel/providers/groupwise/camel-groupwise-folder.c
@@ -2420,7 +2420,7 @@ gw_update_all_items (CamelFolder *folder, GList *item_list, GError **error)
} else {
item_list = g_list_delete_link (item_list, temp);
}
- index ++;
+ index++;
}
groupwise_sync_summary (folder, error);
@@ -2597,7 +2597,7 @@ groupwise_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
changes = camel_folder_change_info_new ();
while (index < uids->len) {
item_ids = g_list_append (item_ids, g_ptr_array_index (uids, index));
- index ++;
+ index++;
}
if (transferred_uids)
@@ -2741,7 +2741,7 @@ groupwise_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
if (status == E_GW_CONNECTION_STATUS_OK) {
if (delete_originals) {
if (!(gw_info->info.flags & CAMEL_MESSAGE_SEEN))
- source->summary->unread_count --;
+ source->summary->unread_count--;
camel_folder_summary_remove_uid (source->summary, uids->pdata[index]);
camel_folder_change_info_remove_uid (changes, uids->pdata[index]);
@@ -2752,7 +2752,7 @@ groupwise_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
}
}
- index ++;
+ index++;
}
camel_folder_changed (source, changes);
diff --git a/camel/providers/imap/camel-imap-store-summary.c b/camel/providers/imap/camel-imap-store-summary.c
index 0e7b1f3..b4e0680 100644
--- a/camel/providers/imap/camel-imap-store-summary.c
+++ b/camel/providers/imap/camel-imap-store-summary.c
@@ -520,7 +520,7 @@ namespaces_load (CamelImapStoreSummary *s, FILE *in, guint count)
tail = &ns->next;
}
- count --;
+ count--;
}
return count == 0;
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index 62d569b..ba2272c 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -1478,7 +1478,7 @@ camel_nntp_command (CamelNNTPStore *store, GError **error, CamelNNTPFolder *fold
retry = 0;
do {
- retry ++;
+ retry++;
if (store->stream == NULL
&& !camel_service_connect (CAMEL_SERVICE (store), error))
diff --git a/libedataserver/e-source-group.c b/libedataserver/e-source-group.c
index e482491..c4ca948 100644
--- a/libedataserver/e-source-group.c
+++ b/libedataserver/e-source-group.c
@@ -457,7 +457,7 @@ e_source_group_update_from_xmldoc (ESourceGroup *group,
} else {
gboolean source_changed;
- group->priv->ignore_source_changed ++;
+ group->priv->ignore_source_changed++;
if (e_source_update_from_xml_node (existing_source, nodep, &source_changed)) {
new_sources_list = g_slist_prepend (new_sources_list, existing_source);
@@ -468,7 +468,7 @@ e_source_group_update_from_xmldoc (ESourceGroup *group,
changed = TRUE;
}
- group->priv->ignore_source_changed --;
+ group->priv->ignore_source_changed--;
}
g_free (uid);
diff --git a/libedataserver/e-source-list.c b/libedataserver/e-source-list.c
index 7e9c922..e3a147f 100644
--- a/libedataserver/e-source-list.c
+++ b/libedataserver/e-source-list.c
@@ -114,7 +114,7 @@ load_from_gconf (ESourceList *list)
} else {
gboolean group_changed;
- list->priv->ignore_group_changed ++;
+ list->priv->ignore_group_changed++;
if (e_source_group_update_from_xmldoc (existing_group, xmldoc, &group_changed)) {
new_groups_list = g_slist_prepend (new_groups_list, existing_group);
@@ -125,7 +125,7 @@ load_from_gconf (ESourceList *list)
changed = TRUE;
}
- list->priv->ignore_group_changed --;
+ list->priv->ignore_group_changed--;
}
xmlFreeDoc (xmldoc);
diff --git a/servers/groupwise/e-gw-connection.c b/servers/groupwise/e-gw-connection.c
index 6ee881d..8699021 100644
--- a/servers/groupwise/e-gw-connection.c
+++ b/servers/groupwise/e-gw-connection.c
@@ -1099,7 +1099,7 @@ e_gw_connection_get_items_from_ids (EGwConnection *cnc, const gchar *container,
if (view)
e_gw_message_write_string_parameter (msg, "view", NULL, view);
soup_soap_message_start_element (msg, "items", NULL, NULL);
- for (i = 0; i < item_ids->len; i ++) {
+ for (i = 0; i < item_ids->len; i++) {
gchar *id = g_ptr_array_index (item_ids, i);
e_gw_message_write_string_parameter (msg, "item", NULL, id);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
