[evolution-data-server] Coding style and whitespace cleanups.
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Coding style and whitespace cleanups.
- Date: Sat, 30 Jan 2010 23:10:41 +0000 (UTC)
commit b50a890678ec22031b0aa656b36e352121d66ca9
Author: Matthew Barnes <mbarnes redhat com>
Date: Sat Jan 30 17:35:44 2010 -0500
Coding style and whitespace cleanups.
addressbook/backends/file/e-book-backend-file.c | 6 +-
addressbook/backends/file/e-book-backend-file.h | 2 +-
.../backends/groupwise/e-book-backend-groupwise.c | 4 +-
.../backends/groupwise/e-book-backend-groupwise.h | 2 +-
addressbook/backends/ldap/e-book-backend-ldap.c | 4 +-
addressbook/backends/ldap/e-book-backend-ldap.h | 2 +-
addressbook/backends/ldap/openldap-extract.h | 264 ++++++++++----------
addressbook/backends/vcf/e-book-backend-vcf.c | 6 +-
addressbook/backends/vcf/e-book-backend-vcf.h | 2 +-
.../backends/webdav/e-book-backend-webdav.c | 2 +-
addressbook/libebook/e-address-western.h | 2 +-
addressbook/libebook/e-book-types.h | 2 +-
addressbook/libebook/e-book-view-private.h | 2 +-
addressbook/libebook/e-book-view.h | 2 +-
addressbook/libebook/e-book.h | 2 +-
addressbook/libebook/e-contact.c | 2 +-
addressbook/libebook/e-destination.c | 8 +-
addressbook/libebook/e-name-western.c | 16 +-
addressbook/libebook/e-name-western.h | 2 +-
addressbook/libebook/e-vcard.c | 2 +-
addressbook/libedata-book/e-book-backend-factory.c | 2 +-
addressbook/libedata-book/e-book-backend-sexp.c | 2 +-
addressbook/libedata-book/e-book-backend-summary.c | 2 +-
addressbook/libedata-book/e-book-backend-sync.c | 2 +-
addressbook/libedata-book/e-book-backend-sync.h | 2 +-
addressbook/libedata-book/e-book-backend.c | 2 +-
addressbook/libedata-book/e-book-backend.h | 2 +-
addressbook/libedata-book/e-data-book-factory.h | 2 +-
addressbook/libedata-book/e-data-book-view.h | 2 +-
addressbook/libedata-book/e-data-book.h | 2 +-
calendar/backends/caldav/e-cal-backend-caldav.c | 6 +-
calendar/libedata-cal/e-cal-backend-factory.c | 2 +-
.../libedata-cal/e-cal-backend-loader-factory.c | 2 +-
calendar/libedata-cal/e-cal-backend-sexp.c | 2 +-
calendar/libedata-cal/e-cal-backend-sync.c | 2 +-
calendar/libedata-cal/e-cal-backend-sync.h | 2 +-
camel/camel-address.h | 2 +-
camel/camel-block-file.h | 2 +-
camel/camel-charset-map.c | 2 +-
camel/camel-charset-map.h | 2 +-
camel/camel-data-cache.c | 2 +-
camel/camel-digest-folder.h | 2 +-
camel/camel-filter-driver.h | 2 +-
camel/camel-filter-search.h | 2 +-
camel/camel-folder-search.c | 2 +-
camel/camel-folder-search.h | 2 +-
camel/camel-folder-summary.c | 50 ++--
camel/camel-folder-summary.h | 2 +-
camel/camel-folder-thread.h | 2 +-
camel/camel-folder.c | 2 +-
camel/camel-folder.h | 2 +-
camel/camel-html-parser.h | 2 +-
camel/camel-iconv.c | 2 +-
camel/camel-index.h | 2 +-
camel/camel-internet-address.h | 2 +-
camel/camel-list-utils.c | 2 +-
camel/camel-lock-client.c | 4 +-
camel/camel-lock-client.h | 2 +-
camel/camel-lock-helper.h | 2 +-
camel/camel-lock.c | 2 +-
camel/camel-lock.h | 2 +-
camel/camel-mime-filter-basic.h | 2 +-
camel/camel-mime-filter-bestenc.h | 2 +-
camel/camel-mime-filter-canon.h | 2 +-
camel/camel-mime-filter-charset.h | 2 +-
camel/camel-mime-filter-crlf.h | 2 +-
camel/camel-mime-filter-from.h | 2 +-
camel/camel-mime-filter-html.h | 2 +-
camel/camel-mime-filter-index.h | 2 +-
camel/camel-mime-filter-linewrap.h | 2 +-
camel/camel-mime-filter-pgp.h | 2 +-
camel/camel-mime-filter.h | 2 +-
camel/camel-mime-message.c | 2 +-
camel/camel-mime-parser.c | 2 +-
camel/camel-mime-parser.h | 2 +-
camel/camel-mime-utils.c | 4 +-
camel/camel-mime-utils.h | 2 +-
camel/camel-news-address.h | 2 +-
camel/camel-nntp-address.h | 2 +-
camel/camel-partition-table.c | 2 +-
camel/camel-partition-table.h | 2 +-
camel/camel-search-private.h | 2 +-
camel/camel-search-sql-sexp.h | 2 +-
camel/camel-search-sql.h | 2 +-
camel/camel-store-summary.c | 2 +-
camel/camel-store-summary.h | 2 +-
camel/camel-stream-filter.h | 2 +-
camel/camel-stream-null.h | 2 +-
camel/camel-stream-process.h | 2 +-
camel/camel-text-index.c | 26 +-
camel/camel-text-index.h | 2 +-
camel/camel-utf8.c | 6 +-
camel/camel-utf8.h | 2 +-
camel/camel-vee-folder.c | 2 +-
camel/camel-vee-folder.h | 2 +-
camel/camel-vee-store.h | 2 +-
camel/camel-vee-summary.h | 2 +-
camel/camel-vtrash-folder.c | 2 +-
camel/camel-vtrash-folder.h | 2 +-
camel/db-scrap-tools/db.c | 2 +-
camel/providers/groupwise/camel-groupwise-folder.c | 6 +-
.../groupwise/camel-groupwise-store-summary.c | 4 +-
.../groupwise/camel-groupwise-store-summary.h | 2 +-
camel/providers/groupwise/camel-groupwise-store.c | 2 +-
camel/providers/groupwise/camel-groupwise-utils.c | 2 +-
camel/providers/imap/camel-imap-search.c | 2 +-
camel/providers/imap/camel-imap-search.h | 2 +-
camel/providers/imap/camel-imap-store-summary.c | 2 +-
camel/providers/imap/camel-imap-store-summary.h | 2 +-
camel/providers/imap/camel-imap-summary.h | 2 +-
camel/providers/imap/camel-imap-utils.c | 2 +-
camel/providers/imapx/camel-imapx-server.c | 6 +-
camel/providers/imapx/camel-imapx-server.h | 2 +-
camel/providers/imapx/camel-imapx-store-summary.c | 2 +-
camel/providers/imapx/camel-imapx-store-summary.h | 2 +-
camel/providers/imapx/camel-imapx-stream.h | 2 +-
camel/providers/imapx/camel-imapx-summary.h | 2 +-
camel/providers/imapx/camel-imapx-utils.c | 8 +-
camel/providers/imapx/camel-imapx-view-summary.h | 2 +-
camel/providers/local/camel-local-summary.h | 2 +-
camel/providers/local/camel-maildir-store.c | 4 +-
camel/providers/local/camel-maildir-summary.c | 10 +-
camel/providers/local/camel-maildir-summary.h | 2 +-
camel/providers/local/camel-mbox-summary.h | 2 +-
camel/providers/local/camel-mh-summary.c | 4 +-
camel/providers/local/camel-mh-summary.h | 2 +-
camel/providers/local/camel-spool-store.c | 2 +-
camel/providers/local/camel-spool-summary.h | 2 +-
camel/providers/nntp/camel-nntp-store-summary.h | 2 +-
camel/providers/nntp/camel-nntp-store.c | 2 +-
camel/providers/nntp/camel-nntp-stream.h | 2 +-
camel/providers/nntp/camel-nntp-summary.h | 2 +-
camel/providers/pop3/camel-pop3-engine.c | 4 +-
camel/providers/pop3/camel-pop3-engine.h | 2 +-
camel/providers/pop3/camel-pop3-stream.h | 2 +-
camel/tests/lib/address-data.h | 2 +-
libebackend/e-db3-utils.h | 2 +-
libebackend/e-dbhash.h | 2 +-
libedataserver/e-iconv.c | 2 +-
libedataserver/e-iconv.h | 2 +-
libedataserver/e-iterator.h | 2 +-
libedataserver/e-list-iterator.h | 2 +-
libedataserver/e-list.h | 2 +-
libedataserver/e-memory.c | 2 +-
libedataserver/e-memory.h | 2 +-
libedataserver/e-msgport.c | 2 +-
libedataserver/e-proxy.c | 2 +-
libedataserver/e-sexp.c | 2 +-
libedataserver/e-source-group.c | 4 +-
libedataserver/e-source-list.c | 8 +-
libedataserver/e-time-utils.c | 10 +-
libedataserver/test-source-list.c | 2 +-
libedataserverui/e-name-selector-entry.c | 2 +-
libedataserverui/e-name-selector-list.c | 2 +-
libedataserverui/e-source-selector.c | 8 +-
servers/groupwise/e-gw-item.c | 6 +-
156 files changed, 373 insertions(+), 373 deletions(-)
---
diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c
index af52fc9..2a8aaa7 100644
--- a/addressbook/backends/file/e-book-backend-file.c
+++ b/addressbook/backends/file/e-book-backend-file.c
@@ -556,7 +556,7 @@ book_view_thread (gpointer data)
db = bf->priv->file_db;
query = e_data_book_view_get_card_query (book_view);
- if ( ! strcmp (query, "(contains \"x-evolution-any-field\" \"\")")) {
+ if ( !strcmp (query, "(contains \"x-evolution-any-field\" \"\")")) {
e_data_book_view_notify_status_message (book_view, _("Loading..."));
allcontacts = TRUE;
} else {
@@ -1383,7 +1383,7 @@ e_book_backend_file_construct (EBookBackendFile *backend)
g_assert (backend != NULL);
g_assert (E_IS_BOOK_BACKEND_FILE (backend));
- if (! e_book_backend_construct (E_BOOK_BACKEND (backend)))
+ if (!e_book_backend_construct (E_BOOK_BACKEND (backend)))
return FALSE;
return TRUE;
@@ -1399,7 +1399,7 @@ e_book_backend_file_new (void)
backend = g_object_new (E_TYPE_BOOK_BACKEND_FILE, NULL);
- if (! e_book_backend_file_construct (backend)) {
+ if (!e_book_backend_file_construct (backend)) {
g_object_unref (backend);
return NULL;
diff --git a/addressbook/backends/file/e-book-backend-file.h b/addressbook/backends/file/e-book-backend-file.h
index aa31a9e..981c41f 100644
--- a/addressbook/backends/file/e-book-backend-file.h
+++ b/addressbook/backends/file/e-book-backend-file.h
@@ -49,5 +49,5 @@ typedef struct {
EBookBackend *e_book_backend_file_new (void);
GType e_book_backend_file_get_type (void);
-#endif /* ! __E_BOOK_BACKEND_FILE_H__ */
+#endif /* __E_BOOK_BACKEND_FILE_H__ */
diff --git a/addressbook/backends/groupwise/e-book-backend-groupwise.c b/addressbook/backends/groupwise/e-book-backend-groupwise.c
index 185180c..3b006e3 100644
--- a/addressbook/backends/groupwise/e-book-backend-groupwise.c
+++ b/addressbook/backends/groupwise/e-book-backend-groupwise.c
@@ -326,7 +326,7 @@ set_im_changes (EGwItem *new_item, EGwItem *old_item)
}
}
- if (! ims_matched)
+ if (!ims_matched)
added_ims = g_list_append (added_ims, im1);
}
@@ -3262,7 +3262,7 @@ e_book_backend_groupwise_authenticate_user (EBookBackend *backend,
if (status == E_GW_CONNECTION_STATUS_INVALID_CONNECTION)
status = e_gw_connection_get_address_book_id (priv->cnc, priv->book_name, &id, &is_writable);
if (status == E_GW_CONNECTION_STATUS_OK) {
- if ( (id == NULL) && !priv->only_if_exists ) {
+ if ((id == NULL) && !priv->only_if_exists) {
status = e_gw_connection_create_book (priv->cnc, priv->book_name, &id);
is_writable = TRUE;
if (status != E_GW_CONNECTION_STATUS_OK ) {
diff --git a/addressbook/backends/groupwise/e-book-backend-groupwise.h b/addressbook/backends/groupwise/e-book-backend-groupwise.h
index bc3299d..080d6a4 100644
--- a/addressbook/backends/groupwise/e-book-backend-groupwise.h
+++ b/addressbook/backends/groupwise/e-book-backend-groupwise.h
@@ -47,5 +47,5 @@ typedef struct {
EBookBackend *e_book_backend_groupwise_new (void);
GType e_book_backend_groupwise_get_type (void);
-#endif /* ! __E_BOOK_BACKEND_GROUPWISE_H__ */
+#endif /* __E_BOOK_BACKEND_GROUPWISE_H__ */
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index 5ca2bff..d7a9ee8 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -5335,7 +5335,7 @@ e_book_backend_ldap_construct (EBookBackendLDAP *backend)
g_assert (backend != NULL);
g_assert (E_IS_BOOK_BACKEND_LDAP (backend));
- if (! e_book_backend_construct (E_BOOK_BACKEND (backend)))
+ if (!e_book_backend_construct (E_BOOK_BACKEND (backend)))
return FALSE;
return TRUE;
@@ -5351,7 +5351,7 @@ e_book_backend_ldap_new (void)
backend = g_object_new (E_TYPE_BOOK_BACKEND_LDAP, NULL);
- if (! e_book_backend_ldap_construct (backend)) {
+ if (!e_book_backend_ldap_construct (backend)) {
g_object_unref (backend);
return NULL;
}
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.h b/addressbook/backends/ldap/e-book-backend-ldap.h
index b49c418..7f2ece8 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.h
+++ b/addressbook/backends/ldap/e-book-backend-ldap.h
@@ -48,5 +48,5 @@ typedef struct {
EBookBackend *e_book_backend_ldap_new (void);
GType e_book_backend_ldap_get_type (void);
-#endif /* ! __E_BOOK_BACKEND_LDAP_H__ */
+#endif /* __E_BOOK_BACKEND_LDAP_H__ */
diff --git a/addressbook/backends/ldap/openldap-extract.h b/addressbook/backends/ldap/openldap-extract.h
index 2dcf5f6..8a10865 100644
--- a/addressbook/backends/ldap/openldap-extract.h
+++ b/addressbook/backends/ldap/openldap-extract.h
@@ -82,7 +82,7 @@
#ifndef LDAP_INSUFFICIENT_ACCESS
#define LDAP_INSUFFICIENT_ACCESS 0x32
#endif
-
+
#endif
#define LDAP_SCHERR_OUTOFMEM 1
@@ -204,12 +204,12 @@ get_token( const gchar ** sp, gchar ** token_val )
kind = TK_QDSTRING;
(*sp)++;
p = *sp;
- while ( **sp != '\'' && **sp != '\0' )
+ while (**sp != '\'' && **sp != '\0')
(*sp)++;
- if ( **sp == '\'' ) {
+ if (**sp == '\'') {
q = *sp;
res = LDAP_MALLOC(q-p+1);
- if ( !res ) {
+ if (!res) {
kind = TK_OUTOFMEM;
} else {
strncpy(res,p,q-p);
@@ -233,7 +233,7 @@ get_token( const gchar ** sp, gchar ** token_val )
(*sp)++;
q = *sp;
res = LDAP_MALLOC(q-p+1);
- if ( !res ) {
+ if (!res) {
kind = TK_OUTOFMEM;
} else {
strncpy(res,p,q-p);
@@ -266,14 +266,14 @@ ldap_int_parse_numericoid(const gchar **sp, gint *code, const gint flags)
gint quoted = 0;
/* Netscape puts the SYNTAX value in quotes (incorrectly) */
- if ( flags & LDAP_SCHEMA_ALLOW_QUOTED && **sp == '\'' ) {
+ if (flags & LDAP_SCHEMA_ALLOW_QUOTED && **sp == '\'') {
quoted = 1;
(*sp)++;
start++;
}
/* Each iteration of this loop gets one decimal string */
while (**sp) {
- if ( !LDAP_DIGIT(**sp) ) {
+ if (!LDAP_DIGIT(**sp)) {
/*
* Initial gchar is not a digit or gchar after dot is
* not a digit
@@ -282,17 +282,17 @@ ldap_int_parse_numericoid(const gchar **sp, gint *code, const gint flags)
return NULL;
}
(*sp)++;
- while ( LDAP_DIGIT(**sp) )
+ while (LDAP_DIGIT(**sp))
(*sp)++;
- if ( **sp != '.' )
+ if (**sp != '.')
break;
/* Otherwise, gobble the dot and loop again */
(*sp)++;
}
/* Now *sp points at the gchar past the numericoid. Perfect. */
len = *sp - start;
- if ( flags & LDAP_SCHEMA_ALLOW_QUOTED && quoted ) {
- if ( **sp == '\'' ) {
+ if (flags & LDAP_SCHEMA_ALLOW_QUOTED && quoted) {
+ if (**sp == '\'') {
(*sp)++;
} else {
*code = LDAP_SCHERR_UNEXPTOKEN;
@@ -326,11 +326,11 @@ parse_qdescrs(const gchar **sp, gint *code)
parse_whsp(sp);
kind = get_token(sp,&sval);
- if ( kind == TK_LEFTPAREN ) {
+ if (kind == TK_LEFTPAREN) {
/* Let's presume there will be at least 2 entries */
size = 3;
res = LDAP_CALLOC(3,sizeof(gchar *));
- if ( !res ) {
+ if (!res) {
*code = LDAP_SCHERR_OUTOFMEM;
return NULL;
}
@@ -338,13 +338,13 @@ parse_qdescrs(const gchar **sp, gint *code)
while (1) {
parse_whsp(sp);
kind = get_token(sp,&sval);
- if ( kind == TK_RIGHTPAREN )
+ if (kind == TK_RIGHTPAREN)
break;
- if ( kind == TK_QDESCR ) {
- if ( pos == size-2 ) {
+ if (kind == TK_QDESCR) {
+ if (pos == size-2) {
size++;
res1 = LDAP_REALLOC(res,size*sizeof(gchar *));
- if ( !res1 ) {
+ if (!res1) {
LDAP_VFREE(res);
LDAP_FREE(sval);
*code = LDAP_SCHERR_OUTOFMEM;
@@ -364,9 +364,9 @@ parse_qdescrs(const gchar **sp, gint *code)
}
parse_whsp(sp);
return(res);
- } else if ( kind == TK_QDESCR ) {
+ } else if (kind == TK_QDESCR) {
res = LDAP_CALLOC(2,sizeof(gchar *));
- if ( !res ) {
+ if (!res) {
*code = LDAP_SCHERR_OUTOFMEM;
return NULL;
}
@@ -400,11 +400,11 @@ parse_oids(const gchar **sp, gint *code, const gint allow_quoted)
*/
parse_whsp(sp);
kind = get_token(sp,&sval);
- if ( kind == TK_LEFTPAREN ) {
+ if (kind == TK_LEFTPAREN) {
/* Let's presume there will be at least 2 entries */
size = 3;
res = LDAP_CALLOC(3,sizeof(gchar *));
- if ( !res ) {
+ if (!res) {
*code = LDAP_SCHERR_OUTOFMEM;
return NULL;
}
@@ -424,18 +424,18 @@ parse_oids(const gchar **sp, gint *code, const gint allow_quoted)
parse_whsp(sp);
while (1) {
kind = get_token(sp,&sval);
- if ( kind == TK_RIGHTPAREN )
+ if (kind == TK_RIGHTPAREN)
break;
- if ( kind == TK_DOLLAR ) {
+ if (kind == TK_DOLLAR) {
parse_whsp(sp);
kind = get_token(sp,&sval);
if ( kind == TK_BAREWORD ||
( allow_quoted &&
kind == TK_QDSTRING ) ) {
- if ( pos == size-2 ) {
+ if (pos == size-2) {
size++;
res1 = LDAP_REALLOC(res,size*sizeof(gchar *));
- if ( !res1 ) {
+ if (!res1) {
LDAP_FREE(sval);
LDAP_VFREE(res);
*code = LDAP_SCHERR_OUTOFMEM;
@@ -464,7 +464,7 @@ parse_oids(const gchar **sp, gint *code, const gint allow_quoted)
} else if ( kind == TK_BAREWORD ||
( allow_quoted && kind == TK_QDSTRING ) ) {
res = LDAP_CALLOC(2,sizeof(gchar *));
- if ( !res ) {
+ if (!res) {
LDAP_FREE(sval);
*code = LDAP_SCHERR_OUTOFMEM;
return NULL;
@@ -512,7 +512,7 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
gchar ** ext_vals;
const gchar * savepos;
- if ( !s ) {
+ if (!s) {
*code = LDAP_SCHERR_EMPTY;
*errp = "";
return NULL;
@@ -521,14 +521,14 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
*errp = s;
oc = LDAP_CALLOC(1,sizeof(LDAPObjectClass));
- if ( !oc ) {
+ if (!oc) {
*code = LDAP_SCHERR_OUTOFMEM;
return NULL;
}
oc->oc_kind = LDAP_SCHEMA_STRUCTURAL;
kind = get_token(&ss,&sval);
- if ( kind != TK_LEFTPAREN ) {
+ if (kind != TK_LEFTPAREN) {
*code = LDAP_SCHERR_NOLEFTPAREN;
LDAP_FREE(sval);
ldap_objectclass_free(oc);
@@ -545,12 +545,12 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
parse_whsp(&ss);
savepos = ss;
oc->oc_oid = ldap_int_parse_numericoid(&ss,code,0);
- if ( !oc->oc_oid ) {
- if ( (flags & LDAP_SCHEMA_ALLOW_ALL) && (ss == savepos) ) {
+ if (!oc->oc_oid) {
+ if ((flags & LDAP_SCHEMA_ALLOW_ALL) && (ss == savepos)) {
/* Backtracking */
ss = savepos;
kind = get_token(&ss,&sval);
- if ( kind == TK_BAREWORD ) {
+ if (kind == TK_BAREWORD) {
if ( !strcasecmp(sval, "NAME") ||
!strcasecmp(sval, "DESC") ||
!strcasecmp(sval, "OBSOLETE") ||
@@ -596,9 +596,9 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
case TK_RIGHTPAREN:
return oc;
case TK_BAREWORD:
- if ( !strcasecmp(sval,"NAME") ) {
+ if (!strcasecmp(sval,"NAME")) {
LDAP_FREE(sval);
- if ( seen_name ) {
+ if (seen_name) {
*code = LDAP_SCHERR_DUPOPT;
*errp = ss;
ldap_objectclass_free(oc);
@@ -606,16 +606,16 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
}
seen_name = 1;
oc->oc_names = parse_qdescrs(&ss,code);
- if ( !oc->oc_names ) {
- if ( *code != LDAP_SCHERR_OUTOFMEM )
+ if (!oc->oc_names) {
+ if (*code != LDAP_SCHERR_OUTOFMEM)
*code = LDAP_SCHERR_BADNAME;
*errp = ss;
ldap_objectclass_free(oc);
return NULL;
}
- } else if ( !strcasecmp(sval,"DESC") ) {
+ } else if (!strcasecmp(sval,"DESC")) {
LDAP_FREE(sval);
- if ( seen_desc ) {
+ if (seen_desc) {
*code = LDAP_SCHERR_DUPOPT;
*errp = ss;
ldap_objectclass_free(oc);
@@ -624,7 +624,7 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
seen_desc = 1;
parse_whsp(&ss);
kind = get_token(&ss,&sval);
- if ( kind != TK_QDSTRING ) {
+ if (kind != TK_QDSTRING) {
*code = LDAP_SCHERR_UNEXPTOKEN;
*errp = ss;
LDAP_FREE(sval);
@@ -633,9 +633,9 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
}
oc->oc_desc = sval;
parse_whsp(&ss);
- } else if ( !strcasecmp(sval,"OBSOLETE") ) {
+ } else if (!strcasecmp(sval,"OBSOLETE")) {
LDAP_FREE(sval);
- if ( seen_obsolete ) {
+ if (seen_obsolete) {
*code = LDAP_SCHERR_DUPOPT;
*errp = ss;
ldap_objectclass_free(oc);
@@ -644,9 +644,9 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
seen_obsolete = 1;
oc->oc_obsolete = LDAP_SCHEMA_YES;
parse_whsp(&ss);
- } else if ( !strcasecmp(sval,"SUP") ) {
+ } else if (!strcasecmp(sval,"SUP")) {
LDAP_FREE(sval);
- if ( seen_sup ) {
+ if (seen_sup) {
*code = LDAP_SCHERR_DUPOPT;
*errp = ss;
ldap_objectclass_free(oc);
@@ -656,14 +656,14 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
oc->oc_sup_oids = parse_oids(&ss,
code,
flags);
- if ( !oc->oc_sup_oids ) {
+ if (!oc->oc_sup_oids) {
*errp = ss;
ldap_objectclass_free(oc);
return NULL;
}
- } else if ( !strcasecmp(sval,"ABSTRACT") ) {
+ } else if (!strcasecmp(sval,"ABSTRACT")) {
LDAP_FREE(sval);
- if ( seen_kind ) {
+ if (seen_kind) {
*code = LDAP_SCHERR_DUPOPT;
*errp = ss;
ldap_objectclass_free(oc);
@@ -672,9 +672,9 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
seen_kind = 1;
oc->oc_kind = LDAP_SCHEMA_ABSTRACT;
parse_whsp(&ss);
- } else if ( !strcasecmp(sval,"STRUCTURAL") ) {
+ } else if (!strcasecmp(sval,"STRUCTURAL")) {
LDAP_FREE(sval);
- if ( seen_kind ) {
+ if (seen_kind) {
*code = LDAP_SCHERR_DUPOPT;
*errp = ss;
ldap_objectclass_free(oc);
@@ -683,9 +683,9 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
seen_kind = 1;
oc->oc_kind = LDAP_SCHEMA_STRUCTURAL;
parse_whsp(&ss);
- } else if ( !strcasecmp(sval,"AUXILIARY") ) {
+ } else if (!strcasecmp(sval,"AUXILIARY")) {
LDAP_FREE(sval);
- if ( seen_kind ) {
+ if (seen_kind) {
*code = LDAP_SCHERR_DUPOPT;
*errp = ss;
ldap_objectclass_free(oc);
@@ -694,9 +694,9 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
seen_kind = 1;
oc->oc_kind = LDAP_SCHEMA_AUXILIARY;
parse_whsp(&ss);
- } else if ( !strcasecmp(sval,"MUST") ) {
+ } else if (!strcasecmp(sval,"MUST")) {
LDAP_FREE(sval);
- if ( seen_must ) {
+ if (seen_must) {
*code = LDAP_SCHERR_DUPOPT;
*errp = ss;
ldap_objectclass_free(oc);
@@ -704,15 +704,15 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
}
seen_must = 1;
oc->oc_at_oids_must = parse_oids(&ss,code,0);
- if ( !oc->oc_at_oids_must ) {
+ if (!oc->oc_at_oids_must) {
*errp = ss;
ldap_objectclass_free(oc);
return NULL;
}
parse_whsp(&ss);
- } else if ( !strcasecmp(sval,"MAY") ) {
+ } else if (!strcasecmp(sval,"MAY")) {
LDAP_FREE(sval);
- if ( seen_may ) {
+ if (seen_may) {
*code = LDAP_SCHERR_DUPOPT;
*errp = ss;
ldap_objectclass_free(oc);
@@ -720,16 +720,16 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
}
seen_may = 1;
oc->oc_at_oids_may = parse_oids(&ss,code,0);
- if ( !oc->oc_at_oids_may ) {
+ if (!oc->oc_at_oids_may) {
*errp = ss;
ldap_objectclass_free(oc);
return NULL;
}
parse_whsp(&ss);
- } else if ( sval[0] == 'X' && sval[1] == '-' ) {
+ } else if (sval[0] == 'X' && sval[1] == '-') {
/* Should be parse_qdstrings */
ext_vals = parse_qdescrs(&ss, code);
- if ( !ext_vals ) {
+ if (!ext_vals) {
*errp = ss;
ldap_objectclass_free(oc);
return NULL;
@@ -772,7 +772,7 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
static gchar *ldap_utf8_strchr( const gchar *str, const gchar *chr )
{
for (; *str != '\0'; LDAP_UTF8_INCR(str) ) {
- if ( ldap_x_utf8_to_ucs4( str ) == ldap_x_utf8_to_ucs4( chr ) ) {
+ if (ldap_x_utf8_to_ucs4( str ) == ldap_x_utf8_to_ucs4( chr )) {
return (gchar *) str;
}
}
@@ -787,7 +787,7 @@ static gsize ldap_utf8_strcspn( const gchar *str, const gchar *set )
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 ) ) {
+ if (ldap_x_utf8_to_ucs4( cstr ) == ldap_x_utf8_to_ucs4( cset )) {
return cstr - str;
}
}
@@ -803,11 +803,11 @@ static gsize ldap_utf8_strspn( const gchar *str, const gchar *set )
for ( cstr = str; *cstr != '\0'; LDAP_UTF8_INCR(cstr) ) {
for ( cset = set; ; LDAP_UTF8_INCR(cset) ) {
- if ( *cset == '\0' ) {
+ if (*cset == '\0') {
return cstr - str;
}
- if ( ldap_x_utf8_to_ucs4( cstr ) == ldap_x_utf8_to_ucs4( cset ) ) {
+ if (ldap_x_utf8_to_ucs4( cstr ) == ldap_x_utf8_to_ucs4( cset )) {
break;
}
}
@@ -821,20 +821,20 @@ static gchar *ldap_utf8_strtok(gchar *str, const gchar *sep, gchar **last)
gchar *begin;
gchar *end;
- if ( last == NULL ) return NULL;
+ if (last == NULL) return NULL;
begin = str ? str : *last;
begin += ldap_utf8_strspn( begin, sep );
- if ( *begin == '\0' ) {
+ if (*begin == '\0') {
*last = NULL;
return NULL;
}
end = &begin[ ldap_utf8_strcspn( begin, sep ) ];
- if ( *end != '\0' ) {
+ if (*end != '\0') {
gchar *next = LDAP_UTF8_NEXT( end );
*end = '\0';
end = next;
@@ -896,14 +896,14 @@ skip_url_prefix(
*/
const gchar *p;
- if ( url == NULL ) {
+ if (url == NULL) {
return( NULL );
}
p = url;
/* skip leading '<' (if any) */
- if ( *p == '<' ) {
+ if (*p == '<') {
*enclosedp = 1;
++p;
} else {
@@ -911,12 +911,12 @@ skip_url_prefix(
}
/* skip leading "URL:" (if any) */
- if ( strncasecmp( p, LDAP_URL_URLCOLON, LDAP_URL_URLCOLON_LEN ) == 0 ) {
+ if (strncasecmp( p, LDAP_URL_URLCOLON, LDAP_URL_URLCOLON_LEN ) == 0) {
p += LDAP_URL_URLCOLON_LEN;
}
/* check for "ldap://"; prefix */
- if ( strncasecmp( p, LDAP_URL_PREFIX, LDAP_URL_PREFIX_LEN ) == 0 ) {
+ if (strncasecmp( p, LDAP_URL_PREFIX, LDAP_URL_PREFIX_LEN ) == 0) {
/* skip over "ldap://"; prefix and return success */
p += LDAP_URL_PREFIX_LEN;
*scheme = "ldap";
@@ -924,7 +924,7 @@ skip_url_prefix(
}
/* check for "ldaps://" prefix */
- if ( strncasecmp( p, LDAPS_URL_PREFIX, LDAPS_URL_PREFIX_LEN ) == 0 ) {
+ if (strncasecmp( p, LDAPS_URL_PREFIX, LDAPS_URL_PREFIX_LEN ) == 0) {
/* skip over "ldaps://" prefix and return success */
p += LDAPS_URL_PREFIX_LEN;
*scheme = "ldaps";
@@ -932,7 +932,7 @@ skip_url_prefix(
}
/* check for "ldapi://" prefix */
- if ( strncasecmp( p, LDAPI_URL_PREFIX, LDAPI_URL_PREFIX_LEN ) == 0 ) {
+ if (strncasecmp( p, LDAPI_URL_PREFIX, LDAPI_URL_PREFIX_LEN ) == 0) {
/* skip over "ldapi://" prefix and return success */
p += LDAPI_URL_PREFIX_LEN;
*scheme = "ldapi";
@@ -941,7 +941,7 @@ skip_url_prefix(
#ifdef LDAP_CONNECTIONLESS
/* check for "cldap://"; prefix */
- if ( strncasecmp( p, LDAPC_URL_PREFIX, LDAPC_URL_PREFIX_LEN ) == 0 ) {
+ if (strncasecmp( p, LDAPC_URL_PREFIX, LDAPC_URL_PREFIX_LEN ) == 0) {
/* skip over "cldap://"; prefix and return success */
p += LDAPC_URL_PREFIX_LEN;
*scheme = "cldap";
@@ -954,19 +954,19 @@ skip_url_prefix(
static gint str2scope( const gchar *p )
{
- if ( strcasecmp( p, "one" ) == 0 ) {
+ if (strcasecmp( p, "one" ) == 0) {
return LDAP_SCOPE_ONELEVEL;
- } else if ( strcasecmp( p, "onelevel" ) == 0 ) {
+ } else if (strcasecmp( p, "onelevel" ) == 0) {
return LDAP_SCOPE_ONELEVEL;
- } else if ( strcasecmp( p, "base" ) == 0 ) {
+ } else if (strcasecmp( p, "base" ) == 0) {
return LDAP_SCOPE_BASE;
- } else if ( strcasecmp( p, "sub" ) == 0 ) {
+ } else if (strcasecmp( p, "sub" ) == 0) {
return LDAP_SCOPE_SUBTREE;
- } else if ( strcasecmp( p, "subtree" ) == 0 ) {
+ } else if (strcasecmp( p, "subtree" ) == 0) {
return LDAP_SCOPE_SUBTREE;
}
@@ -976,31 +976,31 @@ static gint str2scope( const gchar *p )
static void
ldap_free_urldesc( LDAPURLDesc *ludp )
{
- if ( ludp == NULL ) {
+ if (ludp == NULL) {
return;
}
- if ( ludp->lud_scheme != NULL ) {
+ if (ludp->lud_scheme != NULL) {
LDAP_FREE( ludp->lud_scheme );
}
- if ( ludp->lud_host != NULL ) {
+ if (ludp->lud_host != NULL) {
LDAP_FREE( ludp->lud_host );
}
- if ( ludp->lud_dn != NULL ) {
+ if (ludp->lud_dn != NULL) {
LDAP_FREE( ludp->lud_dn );
}
- if ( ludp->lud_filter != NULL ) {
+ if (ludp->lud_filter != NULL) {
LDAP_FREE( ludp->lud_filter);
}
- if ( ludp->lud_attrs != NULL ) {
+ if (ludp->lud_attrs != NULL) {
LDAP_VFREE( ludp->lud_attrs );
}
- if ( ludp->lud_exts != NULL ) {
+ if (ludp->lud_exts != NULL) {
LDAP_VFREE( ludp->lud_exts );
}
@@ -1025,12 +1025,12 @@ ldap_pvt_hex_unescape( gchar *s )
gchar *p;
for ( p = s; *s != '\0'; ++s ) {
- if ( *s == '%' ) {
- if ( *++s == '\0' ) {
+ if (*s == '%') {
+ if (*++s == '\0') {
break;
}
*p = ldap_int_unhex( *s ) << 4;
- if ( *++s == '\0' ) {
+ if (*++s == '\0') {
break;
}
*p++ += ldap_int_unhex( *s );
@@ -1052,20 +1052,20 @@ ldap_str2charray( const gchar *str_in, const gchar *brkstr )
/* protect the input string from strtok */
str = LDAP_STRDUP( str_in );
- if ( str == NULL ) {
+ if (str == NULL) {
return NULL;
}
i = 1;
for ( s = str; *s; s++ ) {
- if ( ldap_utf8_strchr( brkstr, s ) != NULL ) {
+ if (ldap_utf8_strchr( brkstr, s ) != NULL) {
i++;
}
}
res = (gchar **) LDAP_MALLOC( (i + 1) * sizeof(gchar *) );
- if ( res == NULL ) {
+ if (res == NULL) {
LDAP_FREE( str );
return NULL;
}
@@ -1110,7 +1110,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
const gchar *url_tmp;
gchar *url;
- if ( url_in == NULL || ludpp == NULL ) {
+ if (url_in == NULL || ludpp == NULL) {
return LDAP_URL_ERR_PARAM;
}
@@ -1118,7 +1118,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
url_tmp = skip_url_prefix( url_in, &enclosed, &scheme );
- if ( url_tmp == NULL ) {
+ if (url_tmp == NULL) {
return LDAP_URL_ERR_BADSCHEME;
}
@@ -1126,14 +1126,14 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
/* make working copy of the remainder of the URL */
url = LDAP_STRDUP( url_tmp );
- if ( url == NULL ) {
+ if (url == NULL) {
return LDAP_URL_ERR_MEM;
}
- if ( enclosed ) {
+ if (enclosed) {
p = &url[strlen(url)-1];
- if ( *p != '>' ) {
+ if (*p != '>') {
LDAP_FREE( url );
return LDAP_URL_ERR_BADENCLOSURE;
}
@@ -1144,7 +1144,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
/* allocate return struct */
ludp = (LDAPURLDesc *)LDAP_CALLOC( 1, sizeof( LDAPURLDesc ));
- if ( ludp == NULL ) {
+ if (ludp == NULL) {
LDAP_FREE( url );
return LDAP_URL_ERR_MEM;
}
@@ -1161,7 +1161,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
ludp->lud_scheme = LDAP_STRDUP( scheme );
- if ( ludp->lud_scheme == NULL ) {
+ if (ludp->lud_scheme == NULL) {
LDAP_FREE( url );
ldap_free_urldesc( ludp );
return LDAP_URL_ERR_MEM;
@@ -1170,15 +1170,15 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
/* scan forward for '/' that marks end of hostport and begin. of dn */
p = strchr( url, '/' );
- if ( p != NULL ) {
+ if (p != NULL) {
/* terminate hostport; point to start of dn */
*p++ = '\0';
}
/* IPv6 syntax with [ip address]:port */
- if ( *url == '[' ) {
+ if (*url == '[') {
r = strchr( url, ']' );
- if ( r == NULL ) {
+ if (r == NULL) {
LDAP_FREE( url );
ldap_free_urldesc( ludp );
return LDAP_URL_ERR_BADURL;
@@ -1189,20 +1189,20 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
q = strchr( url, ':' );
}
- if ( q != NULL ) {
+ if (q != NULL) {
gchar *next;
*q++ = '\0';
ldap_pvt_hex_unescape( q );
- if ( *q == '\0' ) {
+ if (*q == '\0') {
LDAP_FREE( url );
ldap_free_urldesc( ludp );
return LDAP_URL_ERR_BADURL;
}
ludp->lud_port = strtol( q, &next, 10 );
- if ( next == NULL || next[0] != '\0' ) {
+ if (next == NULL || next[0] != '\0') {
LDAP_FREE( url );
ldap_free_urldesc( ludp );
return LDAP_URL_ERR_BADURL;
@@ -1214,7 +1214,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
/* If [ip address]:port syntax, url is [ip and we skip the [ */
ludp->lud_host = LDAP_STRDUP( url + ( *url == '[' ) );
- if ( ludp->lud_host == NULL ) {
+ if (ludp->lud_host == NULL) {
LDAP_FREE( url );
ldap_free_urldesc( ludp );
return LDAP_URL_ERR_MEM;
@@ -1234,7 +1234,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
/* ? immediately followed by question */
if ( *q == '?') {
q++;
- if ( *q != '\0' ) {
+ if (*q != '\0') {
/* parse dn part */
ldap_pvt_hex_unescape( q );
ludp->lud_dn = LDAP_STRDUP( q );
@@ -1242,7 +1242,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
ludp->lud_dn = LDAP_STRDUP( "" );
}
- if ( ludp->lud_dn == NULL ) {
+ if (ludp->lud_dn == NULL) {
LDAP_FREE( url );
ldap_free_urldesc( ludp );
return LDAP_URL_ERR_MEM;
@@ -1250,7 +1250,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
}
}
- if ( p == NULL ) {
+ if (p == NULL) {
LDAP_FREE( url );
*ludpp = ludp;
return LDAP_URL_SUCCESS;
@@ -1259,12 +1259,12 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
/* scan forward for '?' that may marks end of dn */
q = strchr( p, '?' );
- if ( q != NULL ) {
+ if (q != NULL) {
/* terminate dn part */
*q++ = '\0';
}
- if ( *p != '\0' ) {
+ if (*p != '\0') {
/* parse dn part */
ldap_pvt_hex_unescape( p );
ludp->lud_dn = LDAP_STRDUP( p );
@@ -1272,13 +1272,13 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
ludp->lud_dn = LDAP_STRDUP( "" );
}
- if ( ludp->lud_dn == NULL ) {
+ if (ludp->lud_dn == NULL) {
LDAP_FREE( url );
ldap_free_urldesc( ludp );
return LDAP_URL_ERR_MEM;
}
- if ( q == NULL ) {
+ if (q == NULL) {
/* no more */
LDAP_FREE( url );
*ludpp = ludp;
@@ -1289,24 +1289,24 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
p = q;
q = strchr( p, '?' );
- if ( q != NULL ) {
+ if (q != NULL) {
/* terminate attributes part */
*q++ = '\0';
}
- if ( *p != '\0' ) {
+ if (*p != '\0') {
/* parse attributes */
ldap_pvt_hex_unescape( p );
ludp->lud_attrs = ldap_str2charray( p, "," );
- if ( ludp->lud_attrs == NULL ) {
+ if (ludp->lud_attrs == NULL) {
LDAP_FREE( url );
ldap_free_urldesc( ludp );
return LDAP_URL_ERR_BADATTRS;
}
}
- if ( q == NULL ) {
+ if (q == NULL) {
/* no more */
LDAP_FREE( url );
*ludpp = ludp;
@@ -1317,24 +1317,24 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
p = q;
q = strchr( p, '?' );
- if ( q != NULL ) {
+ if (q != NULL) {
/* terminate the scope part */
*q++ = '\0';
}
- if ( *p != '\0' ) {
+ if (*p != '\0') {
/* parse the scope */
ldap_pvt_hex_unescape( p );
ludp->lud_scope = str2scope( p );
- if ( ludp->lud_scope == -1 ) {
+ if (ludp->lud_scope == -1) {
LDAP_FREE( url );
ldap_free_urldesc( ludp );
return LDAP_URL_ERR_BADSCOPE;
}
}
- if ( q == NULL ) {
+ if (q == NULL) {
/* no more */
LDAP_FREE( url );
*ludpp = ludp;
@@ -1345,16 +1345,16 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
p = q;
q = strchr( p, '?' );
- if ( q != NULL ) {
+ if (q != NULL) {
/* terminate the filter part */
*q++ = '\0';
}
- if ( *p != '\0' ) {
+ if (*p != '\0') {
/* parse the filter */
ldap_pvt_hex_unescape( p );
- if ( ! *p ) {
+ if (!*p) {
/* missing filter */
LDAP_FREE( url );
ldap_free_urldesc( ludp );
@@ -1364,14 +1364,14 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
LDAP_FREE( ludp->lud_filter );
ludp->lud_filter = LDAP_STRDUP( p );
- if ( ludp->lud_filter == NULL ) {
+ if (ludp->lud_filter == NULL) {
LDAP_FREE( url );
ldap_free_urldesc( ludp );
return LDAP_URL_ERR_MEM;
}
}
- if ( q == NULL ) {
+ if (q == NULL) {
/* no more */
LDAP_FREE( url );
*ludpp = ludp;
@@ -1382,7 +1382,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
p = q;
q = strchr( p, '?' );
- if ( q != NULL ) {
+ if (q != NULL) {
/* extra '?' */
LDAP_FREE( url );
ldap_free_urldesc( ludp );
@@ -1392,7 +1392,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
/* parse the extensions */
ludp->lud_exts = ldap_str2charray( p, "," );
- if ( ludp->lud_exts == NULL ) {
+ if (ludp->lud_exts == NULL) {
LDAP_FREE( url );
ldap_free_urldesc( ludp );
return LDAP_URL_ERR_BADEXTS;
@@ -1401,13 +1401,13 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
for ( i=0; ludp->lud_exts[i] != NULL; i++ ) {
ldap_pvt_hex_unescape( ludp->lud_exts[i] );
- if ( *ludp->lud_exts[i] == '!' ) {
+ if (*ludp->lud_exts[i] == '!') {
/* count the number of critical extensions */
ludp->lud_crit_exts++;
}
}
- if ( i == 0 ) {
+ if (i == 0) {
/* must have 1 or more */
LDAP_FREE( url );
ldap_free_urldesc( ludp );
@@ -1425,7 +1425,7 @@ ldap_url_parse( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
{
gint rc = ldap_url_parse_ext( url_in, ludpp );
- if ( rc != LDAP_URL_SUCCESS ) {
+ if (rc != LDAP_URL_SUCCESS) {
return rc;
}
@@ -1439,13 +1439,13 @@ ldap_url_parse( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
}
if ((*ludpp)->lud_port == 0) {
- if ( strcmp((*ludpp)->lud_scheme, "ldap") == 0 ) {
+ if (strcmp((*ludpp)->lud_scheme, "ldap") == 0) {
(*ludpp)->lud_port = LDAP_PORT;
#ifdef LDAP_CONNECTIONLESS
- } else if ( strcmp((*ludpp)->lud_scheme, "cldap") == 0 ) {
+ } else if (strcmp((*ludpp)->lud_scheme, "cldap") == 0) {
(*ludpp)->lud_port = LDAP_PORT;
#endif
- } else if ( strcmp((*ludpp)->lud_scheme, "ldaps") == 0 ) {
+ } else if (strcmp((*ludpp)->lud_scheme, "ldaps") == 0) {
(*ludpp)->lud_port = LDAPS_PORT;
}
}
diff --git a/addressbook/backends/vcf/e-book-backend-vcf.c b/addressbook/backends/vcf/e-book-backend-vcf.c
index 07fb8e5..467dd49 100644
--- a/addressbook/backends/vcf/e-book-backend-vcf.c
+++ b/addressbook/backends/vcf/e-book-backend-vcf.c
@@ -470,7 +470,7 @@ book_view_thread (gpointer data)
query = e_data_book_view_get_card_query (book_view);
- if ( ! strcmp (query, "(contains \"x-evolution-any-field\" \"\")"))
+ if ( !strcmp (query, "(contains \"x-evolution-any-field\" \"\")"))
e_data_book_view_notify_status_message (book_view, _("Loading..."));
else
e_data_book_view_notify_status_message (book_view, _("Searching..."));
@@ -688,7 +688,7 @@ e_book_backend_vcf_construct (EBookBackendVCF *backend)
g_assert (backend != NULL);
g_assert (E_IS_BOOK_BACKEND_VCF (backend));
- if (! e_book_backend_construct (E_BOOK_BACKEND (backend)))
+ if (!e_book_backend_construct (E_BOOK_BACKEND (backend)))
return FALSE;
return TRUE;
@@ -704,7 +704,7 @@ e_book_backend_vcf_new (void)
backend = g_object_new (E_TYPE_BOOK_BACKEND_VCF, NULL);
- if (! e_book_backend_vcf_construct (backend)) {
+ if (!e_book_backend_vcf_construct (backend)) {
g_object_unref (backend);
return NULL;
diff --git a/addressbook/backends/vcf/e-book-backend-vcf.h b/addressbook/backends/vcf/e-book-backend-vcf.h
index 56346e5..5ca067a 100644
--- a/addressbook/backends/vcf/e-book-backend-vcf.h
+++ b/addressbook/backends/vcf/e-book-backend-vcf.h
@@ -47,5 +47,5 @@ typedef struct {
EBookBackend *e_book_backend_vcf_new (void);
GType e_book_backend_vcf_get_type (void);
-#endif /* ! __E_BOOK_BACKEND_VCF_H__ */
+#endif /* __E_BOOK_BACKEND_VCF_H__ */
diff --git a/addressbook/backends/webdav/e-book-backend-webdav.c b/addressbook/backends/webdav/e-book-backend-webdav.c
index 034df8d..8c3fc48 100644
--- a/addressbook/backends/webdav/e-book-backend-webdav.c
+++ b/addressbook/backends/webdav/e-book-backend-webdav.c
@@ -1171,7 +1171,7 @@ e_book_backend_webdav_get_type(void)
{
static GType type = 0;
- if (! type) {
+ if (!type) {
GTypeInfo info = {
sizeof(EBookBackendWebdavClass),
NULL, /* base_class_init */
diff --git a/addressbook/libebook/e-address-western.h b/addressbook/libebook/e-address-western.h
index d72c8f0..8370644 100644
--- a/addressbook/libebook/e-address-western.h
+++ b/addressbook/libebook/e-address-western.h
@@ -22,5 +22,5 @@ void e_address_western_free (EAddressWestern *eaw);
G_END_DECLS
-#endif /* ! __E_ADDRESS_WESTERN_H__ */
+#endif /* !__E_ADDRESS_WESTERN_H__ */
diff --git a/addressbook/libebook/e-book-types.h b/addressbook/libebook/e-book-types.h
index f6ec3db..a927079 100644
--- a/addressbook/libebook/e-book-types.h
+++ b/addressbook/libebook/e-book-types.h
@@ -70,4 +70,4 @@ typedef struct {
G_END_DECLS
-#endif /* ! __E_BOOK_TYPES_H__ */
+#endif /* __E_BOOK_TYPES_H__ */
diff --git a/addressbook/libebook/e-book-view-private.h b/addressbook/libebook/e-book-view-private.h
index b6dcb57..776eb94 100644
--- a/addressbook/libebook/e-book-view-private.h
+++ b/addressbook/libebook/e-book-view-private.h
@@ -29,4 +29,4 @@ EBookView *_e_book_view_new (EBook *book, DBusGProxy *view_proxy, GStaticRecMute
G_END_DECLS
-#endif /* ! __E_BOOK_VIEW_PRIVATE_H__ */
+#endif /* __E_BOOK_VIEW_PRIVATE_H__ */
diff --git a/addressbook/libebook/e-book-view.h b/addressbook/libebook/e-book-view.h
index a537646..e240c99 100644
--- a/addressbook/libebook/e-book-view.h
+++ b/addressbook/libebook/e-book-view.h
@@ -65,4 +65,4 @@ struct _EBook *e_book_view_get_book (EBookView *book_view);
G_END_DECLS
-#endif /* ! __E_BOOK_VIEW_H__ */
+#endif /* __E_BOOK_VIEW_H__ */
diff --git a/addressbook/libebook/e-book.h b/addressbook/libebook/e-book.h
index de8731b..3a73c31 100644
--- a/addressbook/libebook/e-book.h
+++ b/addressbook/libebook/e-book.h
@@ -256,4 +256,4 @@ GType e_book_get_type (void);
G_END_DECLS
-#endif /* ! __E_BOOK_H__ */
+#endif /* __E_BOOK_H__ */
diff --git a/addressbook/libebook/e-contact.c b/addressbook/libebook/e-contact.c
index a2d6295..e8bb7cc 100644
--- a/addressbook/libebook/e-contact.c
+++ b/addressbook/libebook/e-contact.c
@@ -1867,7 +1867,7 @@ e_contact_date_from_string (const gchar *str)
date->year = str[0] * 1000 + str[1] * 100 + str[2] * 10 + str[3] - '0' * 1111;
date->month = str[5] * 10 + str[6] - '0' * 11;
date->day = str[8] * 10 + str[9] - '0' * 11;
- } else if ( length == 8 ) {
+ } else if (length == 8) {
date->year = str[0] * 1000 + str[1] * 100 + str[2] * 10 + str[3] - '0' * 1111;
date->month = str[4] * 10 + str[5] - '0' * 11;
date->day = str[6] * 10 + str[7] - '0' * 11;
diff --git a/addressbook/libebook/e-destination.c b/addressbook/libebook/e-destination.c
index ef12067..5296d68 100644
--- a/addressbook/libebook/e-destination.c
+++ b/addressbook/libebook/e-destination.c
@@ -342,7 +342,7 @@ e_destination_equal (const EDestination *a, const EDestination *b)
/* Check equality of contacts. */
if (pa->contact || pb->contact) {
- if (! (pa->contact && pb->contact))
+ if (!(pa->contact && pb->contact))
return FALSE;
if (pa->contact == pb->contact || !strcmp (e_contact_get_const (pa->contact, E_CONTACT_UID),
@@ -355,7 +355,7 @@ e_destination_equal (const EDestination *a, const EDestination *b)
/* Just in case name returns NULL */
na = e_destination_get_name (a);
nb = e_destination_get_name (b);
- if ((na || nb) && !(na && nb && ! utf8_casefold_collate (na, nb)))
+ if ((na || nb) && !(na && nb && !utf8_casefold_collate (na, nb)))
return FALSE;
if (!g_ascii_strcasecmp (e_destination_get_email (a), e_destination_get_email (b)))
@@ -1458,7 +1458,7 @@ e_destination_import (const gchar *str)
dest_doc = xmlParseMemory ((gchar *) str, strlen (str));
if (dest_doc && dest_doc->xmlRootNode) {
dest = e_destination_new ();
- if (! e_destination_xml_decode (dest, dest_doc->xmlRootNode)) {
+ if (!e_destination_xml_decode (dest, dest_doc->xmlRootNode)) {
g_object_unref (dest);
dest = NULL;
}
@@ -1493,7 +1493,7 @@ e_destination_exportv (EDestination **destv)
xmlDocSetRootElement (destv_doc, destv_node);
for (i = 0; destv[i]; i++) {
- if (! e_destination_empty (destv[i])) {
+ if (!e_destination_empty (destv[i])) {
xmlNodePtr dest_node = e_destination_xml_encode (destv[i]);
if (dest_node)
xmlAddChild (destv_node, dest_node);
diff --git a/addressbook/libebook/e-name-western.c b/addressbook/libebook/e-name-western.c
index 01e2dc1..e24155f 100644
--- a/addressbook/libebook/e-name-western.c
+++ b/addressbook/libebook/e-name-western.c
@@ -68,7 +68,7 @@ e_name_western_cleanup_string (gchar **str)
p = g_utf8_prev_char (p);
/* advance p to after the character that caused us to exit the
previous loop, and end the string. */
- if ((! g_unichar_isspace (g_utf8_get_char (p))) && *p != ',')
+ if ((!g_unichar_isspace (g_utf8_get_char (p))) && *p != ',')
p = g_utf8_next_char (p);
*p = '\0';
}
@@ -91,7 +91,7 @@ e_name_western_get_words_at_idx (gchar *str, gint idx, gint num_words)
word_count = 0;
p = str + idx;
while (word_count < num_words && *p != '\0') {
- while (! g_unichar_isspace (g_utf8_get_char (p)) && *p != '\0') {
+ while (!g_unichar_isspace (g_utf8_get_char (p)) && *p != '\0') {
words = g_string_append_unichar (words, g_utf8_get_char (p));
p = g_utf8_next_char (p);
}
@@ -156,7 +156,7 @@ e_name_western_get_one_prefix_at_str (gchar *str)
words = e_name_western_get_words_at_idx (str, 0, pfx_words);
folded_words = g_utf8_casefold (words, -1);
- if (! g_utf8_collate (folded_words, prefix)) {
+ if (!g_utf8_collate (folded_words, prefix)) {
g_free (folded_words);
return words;
}
@@ -240,7 +240,7 @@ e_name_western_is_complex_last_beginning (gchar *word)
for (i = 0; i < G_N_ELEMENTS (western_complex_last_index); i++) {
const gchar *last = western_complex_last_table + western_complex_last_index[i];
- if (! g_utf8_collate (folded_word, last)) {
+ if (!g_utf8_collate (folded_word, last)) {
g_free (folded_word);
return TRUE;
}
@@ -467,7 +467,7 @@ e_name_western_extract_last (ENameWestern *name, ENameWesternIdxs *idxs)
*/
if (idx == -1) {
word = e_name_western_get_words_at_idx (name->full, 0, 1);
- if (! e_name_western_is_complex_last_beginning (word)) {
+ if (!e_name_western_is_complex_last_beginning (word)) {
g_free (word);
return;
}
@@ -517,7 +517,7 @@ e_name_western_get_preceding_word (gchar *str, gint idx)
while (g_unichar_isspace (g_utf8_get_char (p)) && p > str)
p = g_utf8_prev_char (p);
- while (! g_unichar_isspace (g_utf8_get_char (p)) && p > str)
+ while (!g_unichar_isspace (g_utf8_get_char (p)) && p > str)
p = g_utf8_prev_char (p);
if (g_unichar_isspace (g_utf8_get_char (p)))
@@ -630,7 +630,7 @@ e_name_western_reorder_asshole (ENameWestern *name, ENameWesternIdxs *idxs)
gchar *comma;
gchar *p;
- if (! e_name_western_detect_backwards (name, idxs))
+ if (!e_name_western_detect_backwards (name, idxs))
return;
/*
@@ -705,7 +705,7 @@ e_name_western_reorder_asshole (ENameWestern *name, ENameWesternIdxs *idxs)
* Walk backwards until we hit the space which
* separates the suffix from firstmidnick.
*/
- while (! g_unichar_isspace (g_utf8_get_char (q)) && q > comma)
+ while (!g_unichar_isspace (g_utf8_get_char (q)) && q > comma)
q = g_utf8_prev_char (q);
if ((q - p + 1) > 0) {
diff --git a/addressbook/libebook/e-name-western.h b/addressbook/libebook/e-name-western.h
index eace451..fe2dacf 100644
--- a/addressbook/libebook/e-name-western.h
+++ b/addressbook/libebook/e-name-western.h
@@ -24,4 +24,4 @@ void e_name_western_free (ENameWestern *w);
G_END_DECLS
-#endif /* ! __E_NAME_WESTERN_H__ */
+#endif /* __E_NAME_WESTERN_H__ */
diff --git a/addressbook/libebook/e-vcard.c b/addressbook/libebook/e-vcard.c
index 2398a2b..bdcc96e 100644
--- a/addressbook/libebook/e-vcard.c
+++ b/addressbook/libebook/e-vcard.c
@@ -185,7 +185,7 @@ skip_to_next_line (gchar **p)
lp = g_utf8_next_char (lp);
/* -- skip over the endline */
- while ( *lp == '\r' || *lp == '\n' ) {
+ while (*lp == '\r' || *lp == '\n') {
lp = g_utf8_next_char (lp);
}
diff --git a/addressbook/libedata-book/e-book-backend-factory.c b/addressbook/libedata-book/e-book-backend-factory.c
index 66fdcc0..7476f8a 100644
--- a/addressbook/libedata-book/e-book-backend-factory.c
+++ b/addressbook/libedata-book/e-book-backend-factory.c
@@ -30,7 +30,7 @@ e_book_backend_factory_get_type (void)
{
static GType type = 0;
- if (! type) {
+ if (!type) {
GTypeInfo info = {
sizeof (EBookBackendFactoryClass),
NULL, /* base_class_init */
diff --git a/addressbook/libedata-book/e-book-backend-sexp.c b/addressbook/libedata-book/e-book-backend-sexp.c
index de16beb..fe67091 100644
--- a/addressbook/libedata-book/e-book-backend-sexp.c
+++ b/addressbook/libedata-book/e-book-backend-sexp.c
@@ -940,7 +940,7 @@ e_book_backend_sexp_get_type (void)
{
static GType type = 0;
- if (! type) {
+ if (!type) {
GTypeInfo info = {
sizeof (EBookBackendSExpClass),
NULL, /* base_class_init */
diff --git a/addressbook/libedata-book/e-book-backend-summary.c b/addressbook/libedata-book/e-book-backend-summary.c
index 84d1b9a..9fed9fc 100644
--- a/addressbook/libedata-book/e-book-backend-summary.c
+++ b/addressbook/libedata-book/e-book-backend-summary.c
@@ -242,7 +242,7 @@ e_book_backend_summary_get_type (void)
{
static GType type = 0;
- if (! type) {
+ if (!type) {
GTypeInfo info = {
sizeof (EBookBackendSummaryClass),
NULL, /* base_class_init */
diff --git a/addressbook/libedata-book/e-book-backend-sync.c b/addressbook/libedata-book/e-book-backend-sync.c
index 3365a1c..11ad076 100644
--- a/addressbook/libedata-book/e-book-backend-sync.c
+++ b/addressbook/libedata-book/e-book-backend-sync.c
@@ -586,7 +586,7 @@ e_book_backend_sync_get_type (void)
{
static GType type = 0;
- if (! type) {
+ if (!type) {
GTypeInfo info = {
sizeof (EBookBackendSyncClass),
NULL, /* base_class_init */
diff --git a/addressbook/libedata-book/e-book-backend-sync.h b/addressbook/libedata-book/e-book-backend-sync.h
index 589fa62..b233dc0 100644
--- a/addressbook/libedata-book/e-book-backend-sync.h
+++ b/addressbook/libedata-book/e-book-backend-sync.h
@@ -95,4 +95,4 @@ EBookBackendSyncStatus e_book_backend_sync_get_supported_auth_methods (EBookBack
G_END_DECLS
-#endif /* ! __E_BOOK_BACKEND_SYNC_H__ */
+#endif /* __E_BOOK_BACKEND_SYNC_H__ */
diff --git a/addressbook/libedata-book/e-book-backend.c b/addressbook/libedata-book/e-book-backend.c
index 0842906..9d9f14d 100644
--- a/addressbook/libedata-book/e-book-backend.c
+++ b/addressbook/libedata-book/e-book-backend.c
@@ -1056,7 +1056,7 @@ e_book_backend_get_type (void)
{
static GType type = 0;
- if (! type) {
+ if (!type) {
GTypeInfo info = {
sizeof (EBookBackendClass),
NULL, /* base_class_init */
diff --git a/addressbook/libedata-book/e-book-backend.h b/addressbook/libedata-book/e-book-backend.h
index f33e6ee..f35f67a 100644
--- a/addressbook/libedata-book/e-book-backend.h
+++ b/addressbook/libedata-book/e-book-backend.h
@@ -195,5 +195,5 @@ GNOME_Evolution_Addressbook_BookChangeItem* e_book_backend_change_delete_new (c
G_END_DECLS
-#endif /* ! __E_BOOK_BACKEND_H__ */
+#endif /* __E_BOOK_BACKEND_H__ */
diff --git a/addressbook/libedata-book/e-data-book-factory.h b/addressbook/libedata-book/e-data-book-factory.h
index 298a988..636ee53 100644
--- a/addressbook/libedata-book/e-data-book-factory.h
+++ b/addressbook/libedata-book/e-data-book-factory.h
@@ -56,4 +56,4 @@ void e_data_book_factory_set_backend_mode (EDataBookFactory *factory, gint mode)
G_END_DECLS
-#endif /* ! __E_DATA_BOOK_FACTORY_H__ */
+#endif /* __E_DATA_BOOK_FACTORY_H__ */
diff --git a/addressbook/libedata-book/e-data-book-view.h b/addressbook/libedata-book/e-data-book-view.h
index 160a443..b8f7b23 100644
--- a/addressbook/libedata-book/e-data-book-view.h
+++ b/addressbook/libedata-book/e-data-book-view.h
@@ -87,4 +87,4 @@ GType e_data_book_view_get_type (void);
G_END_DECLS
-#endif /* ! __E_DATA_BOOK_VIEW_H__ */
+#endif /* __E_DATA_BOOK_VIEW_H__ */
diff --git a/addressbook/libedata-book/e-data-book.h b/addressbook/libedata-book/e-data-book.h
index 6b58a0d..b7c40c4 100644
--- a/addressbook/libedata-book/e-data-book.h
+++ b/addressbook/libedata-book/e-data-book.h
@@ -113,4 +113,4 @@ GType e_data_book_get_type (void);
G_END_DECLS
-#endif /* ! __E_DATA_BOOK_H__ */
+#endif /* __E_DATA_BOOK_H__ */
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
index bf5b8ac..e8792b9 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -518,7 +518,7 @@ check_state (ECalBackendCalDAV *cbdav, gboolean *online)
if (priv->mode == CAL_MODE_LOCAL) {
- if (! priv->do_offline) {
+ if (!priv->do_offline) {
return GNOME_Evolution_Calendar_RepositoryOffline;
}
@@ -949,7 +949,7 @@ caldav_server_open_calendar (ECalBackendCalDAV *cbdav)
send_and_handle_redirection (priv->session, message, NULL);
- if (! SOUP_STATUS_IS_SUCCESSFUL (message->status_code)) {
+ if (!SOUP_STATUS_IS_SUCCESSFUL (message->status_code)) {
guint status_code = message->status_code;
g_object_unref (message);
@@ -980,7 +980,7 @@ caldav_server_open_calendar (ECalBackendCalDAV *cbdav)
g_object_unref (message);
if (calendar_access) {
- priv->read_only = ! (put_allowed && delete_allowed);
+ priv->read_only = !(put_allowed && delete_allowed);
return GNOME_Evolution_Calendar_Success;
}
diff --git a/calendar/libedata-cal/e-cal-backend-factory.c b/calendar/libedata-cal/e-cal-backend-factory.c
index 2bb1aaf..d3056a2 100644
--- a/calendar/libedata-cal/e-cal-backend-factory.c
+++ b/calendar/libedata-cal/e-cal-backend-factory.c
@@ -30,7 +30,7 @@ e_cal_backend_factory_get_type (void)
{
static GType type = 0;
- if (! type) {
+ if (!type) {
GTypeInfo info = {
sizeof (ECalBackendFactoryClass),
NULL, /* base_class_init */
diff --git a/calendar/libedata-cal/e-cal-backend-loader-factory.c b/calendar/libedata-cal/e-cal-backend-loader-factory.c
index 909eb84..d49a4f8 100644
--- a/calendar/libedata-cal/e-cal-backend-loader-factory.c
+++ b/calendar/libedata-cal/e-cal-backend-loader-factory.c
@@ -38,7 +38,7 @@ e_cal_backend_loader_factory_get_type (void)
{
static GType type = 0;
- if (! type) {
+ if (!type) {
GTypeInfo info = {
sizeof (ECalBackendLoaderFactoryClass),
NULL, /* base_class_init */
diff --git a/calendar/libedata-cal/e-cal-backend-sexp.c b/calendar/libedata-cal/e-cal-backend-sexp.c
index 4d84c7b..51cc388 100644
--- a/calendar/libedata-cal/e-cal-backend-sexp.c
+++ b/calendar/libedata-cal/e-cal-backend-sexp.c
@@ -1457,7 +1457,7 @@ e_cal_backend_sexp_get_type (void)
{
static GType type = 0;
- if (! type) {
+ if (!type) {
GTypeInfo info = {
sizeof (ECalBackendSExpClass),
NULL, /* base_class_init */
diff --git a/calendar/libedata-cal/e-cal-backend-sync.c b/calendar/libedata-cal/e-cal-backend-sync.c
index e94eed3..c01d904 100644
--- a/calendar/libedata-cal/e-cal-backend-sync.c
+++ b/calendar/libedata-cal/e-cal-backend-sync.c
@@ -1188,7 +1188,7 @@ e_cal_backend_sync_get_type (void)
{
static GType type = 0;
- if (! type) {
+ if (!type) {
GTypeInfo info = {
sizeof (ECalBackendSyncClass),
NULL, /* base_class_init */
diff --git a/calendar/libedata-cal/e-cal-backend-sync.h b/calendar/libedata-cal/e-cal-backend-sync.h
index 0071046..d157f6b 100644
--- a/calendar/libedata-cal/e-cal-backend-sync.h
+++ b/calendar/libedata-cal/e-cal-backend-sync.h
@@ -161,4 +161,4 @@ ECalBackendSyncStatus e_cal_backend_sync_get_free_busy (ECalBackendSync *backend
G_END_DECLS
-#endif /* ! __E_CAL_BACKEND_SYNC_H__ */
+#endif /* __E_CAL_BACKEND_SYNC_H__ */
diff --git a/camel/camel-address.h b/camel/camel-address.h
index 6bd17b6..8b571b0 100644
--- a/camel/camel-address.h
+++ b/camel/camel-address.h
@@ -72,4 +72,4 @@ void camel_address_remove (CamelAddress *addr, gint index);
G_END_DECLS
-#endif /* ! _CAMEL_ADDRESS_H */
+#endif /* _CAMEL_ADDRESS_H */
diff --git a/camel/camel-block-file.h b/camel/camel-block-file.h
index 318a028..1bf1e5b 100644
--- a/camel/camel-block-file.h
+++ b/camel/camel-block-file.h
@@ -145,4 +145,4 @@ gint camel_key_file_read(CamelKeyFile *kf, camel_block_t *start, gsiz
G_END_DECLS
-#endif /* ! _CAMEL_BLOCK_FILE_H */
+#endif /* _CAMEL_BLOCK_FILE_H */
diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c
index dec0ee8..60f8a49 100644
--- a/camel/camel-charset-map.c
+++ b/camel/camel-charset-map.c
@@ -442,4 +442,4 @@ camel_charset_iso_to_windows (const gchar *isocharset)
return isocharset;
}
-#endif /* !BUILD_MAP */
+#endif /* BUILD_MAP */
diff --git a/camel/camel-charset-map.h b/camel/camel-charset-map.h
index bdc8084..3b6823c 100644
--- a/camel/camel-charset-map.h
+++ b/camel/camel-charset-map.h
@@ -45,4 +45,4 @@ const gchar *camel_charset_iso_to_windows (const gchar *isocharset);
G_END_DECLS
-#endif /* ! _CAMEL_CHARSET_MAP_H */
+#endif /* _CAMEL_CHARSET_MAP_H */
diff --git a/camel/camel-data-cache.c b/camel/camel-data-cache.c
index f9b3c73..7fbcea3 100644
--- a/camel/camel-data-cache.c
+++ b/camel/camel-data-cache.c
@@ -202,7 +202,7 @@ data_cache_expire(CamelDataCache *cdc, const gchar *path, const gchar *keep, tim
return;
s = g_string_new("");
- while ( (dname = g_dir_read_name(dir)) ) {
+ while ((dname = g_dir_read_name(dir))) {
if (strcmp(dname, keep) == 0)
continue;
diff --git a/camel/camel-digest-folder.h b/camel/camel-digest-folder.h
index 8fb310d..dfbfb2d 100644
--- a/camel/camel-digest-folder.h
+++ b/camel/camel-digest-folder.h
@@ -55,6 +55,6 @@ CamelFolder *camel_digest_folder_new (CamelStore *parent_store, CamelMimeMe
G_END_DECLS
-#endif /* ! _CAMEL_DIGEST_FOLDER_H */
+#endif /* _CAMEL_DIGEST_FOLDER_H */
#endif /* CAMEL_DISABLE_DEPRECATED */
diff --git a/camel/camel-filter-driver.h b/camel/camel-filter-driver.h
index c361f9c..82277c1 100644
--- a/camel/camel-filter-driver.h
+++ b/camel/camel-filter-driver.h
@@ -111,4 +111,4 @@ struct filter_option *camel_filter_driver_rule_get (CamelFilterDriver *d, gint n
G_END_DECLS
-#endif /* ! _CAMEL_FILTER_DRIVER_H */
+#endif /* _CAMEL_FILTER_DRIVER_H */
diff --git a/camel/camel-filter-search.h b/camel/camel-filter-search.h
index c786d0a..ec83c3c 100644
--- a/camel/camel-filter-search.h
+++ b/camel/camel-filter-search.h
@@ -45,4 +45,4 @@ gint camel_filter_search_match (CamelSession *session,
G_END_DECLS
-#endif /* ! CAMEL_FILTER_SEARCH_H */
+#endif /* CAMEL_FILTER_SEARCH_H */
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 24292fa..03c352d 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -769,7 +769,7 @@ search_not(struct _ESExp *f, gint argc, struct _ESExpResult **argv, CamelFolderS
gint res = TRUE;
if (argv[0]->type == ESEXP_RES_BOOL)
- res = ! argv[0]->value.bool;
+ res = !argv[0]->value.bool;
r = e_sexp_result_new(f, ESEXP_RES_BOOL);
r->value.bool = res;
diff --git a/camel/camel-folder-search.h b/camel/camel-folder-search.h
index 18f6c25..fa3d982 100644
--- a/camel/camel-folder-search.h
+++ b/camel/camel-folder-search.h
@@ -147,4 +147,4 @@ void camel_folder_search_free_result(CamelFolderSearch *search, GPtrArray *);
G_END_DECLS
-#endif /* ! _CAMEL_FOLDER_SEARCH_H */
+#endif /* _CAMEL_FOLDER_SEARCH_H */
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index a280938..90a10e4 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -1115,56 +1115,56 @@ mir_from_cols (CamelMIRecord *mir, CamelFolderSummary *s, gint ncol, gchar ** co
for (i = 0; i < ncol; ++i) {
- if ( !strcmp (name [i], "uid") )
+ if (!strcmp (name [i], "uid"))
mir->uid = (gchar *) camel_pstring_strdup (cols [i]);
- else if ( !strcmp (name [i], "flags") )
+ else if (!strcmp (name [i], "flags"))
mir->flags = cols [i] ? strtoul (cols [i], NULL, 10) : 0;
- else if ( !strcmp (name [i], "read") )
+ else if (!strcmp (name [i], "read"))
mir->read = (cols [i]) ? ( ((strtoul (cols [i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
- else if ( !strcmp (name [i], "deleted") )
+ else if (!strcmp (name [i], "deleted"))
mir->deleted = (cols [i]) ? ( ((strtoul (cols [i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
- else if ( !strcmp (name [i], "replied") )
+ else if (!strcmp (name [i], "replied"))
mir->replied = (cols [i]) ? ( ((strtoul (cols [i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
- else if ( !strcmp (name [i], "important") )
+ else if (!strcmp (name [i], "important"))
mir->important = (cols [i]) ? ( ((strtoul (cols [i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
- else if ( !strcmp (name [i], "junk") )
+ else if (!strcmp (name [i], "junk"))
mir->junk = (cols [i]) ? ( ((strtoul (cols [i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
- else if ( !strcmp (name [i], "attachment") )
+ else if (!strcmp (name [i], "attachment"))
mir->attachment = (cols [i]) ? ( ((strtoul (cols [i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
- else if ( !strcmp (name [i], "size") )
+ else if (!strcmp (name [i], "size"))
mir->size = cols [i] ? strtoul (cols [i], NULL, 10) : 0;
- else if ( !strcmp (name [i], "dsent") )
+ else if (!strcmp (name [i], "dsent"))
mir->dsent = cols [i] ? strtol (cols [i], NULL, 10) : 0;
- else if ( !strcmp (name [i], "dreceived") )
+ else if (!strcmp (name [i], "dreceived"))
mir->dreceived = cols [i] ? strtol (cols [i], NULL, 10) : 0;
- else if ( !strcmp (name [i], "subject") )
+ else if (!strcmp (name [i], "subject"))
mir->subject = (gchar *) camel_pstring_strdup (cols [i]);
- else if ( !strcmp (name [i], "mail_from") )
+ else if (!strcmp (name [i], "mail_from"))
mir->from = (gchar *) camel_pstring_strdup (cols [i]);
- else if ( !strcmp (name [i], "mail_to") )
+ else if (!strcmp (name [i], "mail_to"))
mir->to = (gchar *) camel_pstring_strdup (cols [i]);
- else if ( !strcmp (name [i], "mail_cc") )
+ else if (!strcmp (name [i], "mail_cc"))
mir->cc = (gchar *) camel_pstring_strdup(cols [i]);
- else if ( !strcmp (name [i], "mlist") )
+ else if (!strcmp (name [i], "mlist"))
mir->mlist = (gchar *) camel_pstring_strdup (cols [i]);
- else if ( !strcmp (name [i], "followup_flag") )
+ else if (!strcmp (name [i], "followup_flag"))
mir->followup_flag = (gchar *) camel_pstring_strdup(cols [i]);
- else if ( !strcmp (name [i], "followup_completed_on") )
+ else if (!strcmp (name [i], "followup_completed_on"))
mir->followup_completed_on = (gchar *) camel_pstring_strdup(cols [i]);
- else if ( !strcmp (name [i], "followup_due_by") )
+ else if (!strcmp (name [i], "followup_due_by"))
mir->followup_due_by = (gchar *) camel_pstring_strdup(cols [i]);
- else if ( !strcmp (name [i], "part") )
+ else if (!strcmp (name [i], "part"))
mir->part = g_strdup (cols [i]);
- else if ( !strcmp (name [i], "labels") )
+ else if (!strcmp (name [i], "labels"))
mir->labels = g_strdup (cols [i]);
- else if ( !strcmp (name [i], "usertags") )
+ else if (!strcmp (name [i], "usertags"))
mir->usertags = g_strdup (cols [i]);
- else if ( !strcmp (name [i], "cinfo") )
+ else if (!strcmp (name [i], "cinfo"))
mir->cinfo = g_strdup(cols [i]);
- else if ( !strcmp (name [i], "bdata") )
+ else if (!strcmp (name [i], "bdata"))
mir->bdata = g_strdup(cols [i]);
/* Evolution itself doesn't yet use this, ignoring
- else if ( !strcmp (name [i], "bodystructure") )
+ else if (!strcmp (name [i], "bodystructure"))
mir->bodystructure = g_strdup(cols [i]); */
}
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index c0e1eb6..eddea51 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -489,4 +489,4 @@ gint camel_folder_summary_migrate_infos(CamelFolderSummary *s);
G_END_DECLS
-#endif /* ! _CAMEL_FOLDER_SUMMARY_H */
+#endif /* _CAMEL_FOLDER_SUMMARY_H */
diff --git a/camel/camel-folder-thread.h b/camel/camel-folder-thread.h
index 1479648..4c0515d 100644
--- a/camel/camel-folder-thread.h
+++ b/camel/camel-folder-thread.h
@@ -65,4 +65,4 @@ gint camel_folder_threaded_messages_dump(CamelFolderThreadNode *c);
G_END_DECLS
-#endif /* !_CAMEL_FOLDER_THREAD_H */
+#endif /* _CAMEL_FOLDER_THREAD_H */
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index c21c735..be88010 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -406,7 +406,7 @@ folder_getv(CamelObject *object, CamelException *ex, CamelArgGetV *args)
deleted++;
if (flags & CAMEL_MESSAGE_JUNK) {
junked++;
- if (! (flags & CAMEL_MESSAGE_DELETED))
+ if (!(flags & CAMEL_MESSAGE_DELETED))
junked_not_deleted++;
}
if ((flags & (CAMEL_MESSAGE_DELETED|CAMEL_MESSAGE_JUNK)) == 0)
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index 4a9c1a9..e847d92 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -233,7 +233,7 @@ void camel_folder_refresh_info (CamelFolder *folder,
void camel_folder_sync (CamelFolder *folder,
gboolean expunge,
CamelException *ex);
-void camel_folder_set_lock_async (CamelFolder *folder,
+void camel_folder_set_lock_async (CamelFolder *folder,
gboolean async);
CamelStore * camel_folder_get_parent_store (CamelFolder *folder);
diff --git a/camel/camel-html-parser.h b/camel/camel-html-parser.h
index 2649656..c792410 100644
--- a/camel/camel-html-parser.h
+++ b/camel/camel-html-parser.h
@@ -79,4 +79,4 @@ const GPtrArray *camel_html_parser_attr_list(CamelHTMLParser *hp, const GPtrArra
G_END_DECLS
-#endif /* ! _CAMEL_HTML_PARSER_H */
+#endif /* _CAMEL_HTML_PARSER_H */
diff --git a/camel/camel-iconv.c b/camel/camel-iconv.c
index 2533d1f..926bc92 100644
--- a/camel/camel-iconv.c
+++ b/camel/camel-iconv.c
@@ -256,7 +256,7 @@ locale_parse_lang (const gchar *locale)
}
}
-/* NOTE: Owns the lock on return if keep is TRUE ! */
+/* NOTE: Owns the lock on return if keep is TRUE !*/
static void
camel_iconv_init(gint keep)
{
diff --git a/camel/camel-index.h b/camel/camel-index.h
index 7b074f4..3d4f0e2 100644
--- a/camel/camel-index.h
+++ b/camel/camel-index.h
@@ -166,4 +166,4 @@ CamelIndexCursor *camel_index_names(CamelIndex *idx);
G_END_DECLS
-#endif /* ! _CAMEL_INDEX_H */
+#endif /* _CAMEL_INDEX_H */
diff --git a/camel/camel-internet-address.h b/camel/camel-internet-address.h
index c214c9a..3c69676 100644
--- a/camel/camel-internet-address.h
+++ b/camel/camel-internet-address.h
@@ -57,4 +57,4 @@ gchar * camel_internet_address_format_address(const gchar *name, const gchar *
G_END_DECLS
-#endif /* ! _CAMEL_INTERNET_ADDRESS_H */
+#endif /* _CAMEL_INTERNET_ADDRESS_H */
diff --git a/camel/camel-list-utils.c b/camel/camel-list-utils.c
index bf9489b..86606ac 100644
--- a/camel/camel-list-utils.c
+++ b/camel/camel-list-utils.c
@@ -221,7 +221,7 @@ camel_slist_remove (CamelSList *l, CamelSListNode *n)
CamelSListNode *p, *q;
p = (CamelSListNode *)l;
- while ( (q = p->next) ) {
+ while ((q = p->next)) {
if (q == n) {
p->next = n->next;
return n;
diff --git a/camel/camel-lock-client.c b/camel/camel-lock-client.c
index 5c9bf8a..33c72ee 100644
--- a/camel/camel-lock-client.c
+++ b/camel/camel-lock-client.c
@@ -214,7 +214,7 @@ again:
default:
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
_("Could not lock '%s'"), path);
- d(printf("locking failed ! status = %d\n", msg->id));
+ d(printf("locking failed !status = %d\n", msg->id));
break;
}
} else if (retry > 0) {
@@ -289,7 +289,7 @@ again:
res = 0;
break;
default:
- d(printf("locking failed ! \n"));
+ d(printf("locking failed !\n"));
break;
}
} else if (retry > 0) {
diff --git a/camel/camel-lock-client.h b/camel/camel-lock-client.h
index a343326..0a99bed 100644
--- a/camel/camel-lock-client.h
+++ b/camel/camel-lock-client.h
@@ -33,4 +33,4 @@ gint camel_lock_helper_unlock(gint lockid);
G_END_DECLS
-#endif /* !_CAMEL_LOCK_HELPER_H */
+#endif /* _CAMEL_LOCK_HELPER_H */
diff --git a/camel/camel-lock-helper.h b/camel/camel-lock-helper.h
index 4fb495d..9582e58 100644
--- a/camel/camel-lock-helper.h
+++ b/camel/camel-lock-helper.h
@@ -61,4 +61,4 @@ enum {
G_END_DECLS
-#endif /* !_CAMEL_LOCK_HELPER_H */
+#endif /* _CAMEL_LOCK_HELPER_H */
diff --git a/camel/camel-lock.c b/camel/camel-lock.c
index 7ebd3cc..d584791 100644
--- a/camel/camel-lock.c
+++ b/camel/camel-lock.c
@@ -143,7 +143,7 @@ camel_lock_dot(const gchar *path, CamelException *ex)
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Timed out trying to get lock file on %s. Try again later."), path);
return -1;
-#else /* ! USE_DOT */
+#else /* !USE_DOT */
return 0;
#endif
}
diff --git a/camel/camel-lock.h b/camel/camel-lock.h
index 1fa23a1..8e3e78f 100644
--- a/camel/camel-lock.h
+++ b/camel/camel-lock.h
@@ -55,4 +55,4 @@ void camel_unlock_folder(const gchar *path, gint fd);
G_END_DECLS
-#endif /* !_CAMEL_LOCK_H */
+#endif /* _CAMEL_LOCK_H */
diff --git a/camel/camel-mime-filter-basic.h b/camel/camel-mime-filter-basic.h
index 1a77993..81ac4dd 100644
--- a/camel/camel-mime-filter-basic.h
+++ b/camel/camel-mime-filter-basic.h
@@ -63,4 +63,4 @@ CamelMimeFilterBasic *camel_mime_filter_basic_new_type (CamelMimeFilterBasi
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_BASIC_H */
+#endif /* _CAMEL_MIME_FILTER_BASIC_H */
diff --git a/camel/camel-mime-filter-bestenc.h b/camel/camel-mime-filter-bestenc.h
index 2fa499a..d978b35 100644
--- a/camel/camel-mime-filter-bestenc.h
+++ b/camel/camel-mime-filter-bestenc.h
@@ -90,4 +90,4 @@ void camel_mime_filter_bestenc_set_flags(CamelMimeFilterBestenc *filter, guint
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_BESTENC_H */
+#endif /* _CAMEL_MIME_FILTER_BESTENC_H */
diff --git a/camel/camel-mime-filter-canon.h b/camel/camel-mime-filter-canon.h
index af931d2..edb661c 100644
--- a/camel/camel-mime-filter-canon.h
+++ b/camel/camel-mime-filter-canon.h
@@ -57,4 +57,4 @@ CamelMimeFilter *camel_mime_filter_canon_new(guint32 flags);
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_CANON_H */
+#endif /* _CAMEL_MIME_FILTER_CANON_H */
diff --git a/camel/camel-mime-filter-charset.h b/camel/camel-mime-filter-charset.h
index 1948d07..9c2db10 100644
--- a/camel/camel-mime-filter-charset.h
+++ b/camel/camel-mime-filter-charset.h
@@ -54,4 +54,4 @@ CamelMimeFilterCharset *camel_mime_filter_charset_new_convert (const gchar
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_CHARSET_H */
+#endif /* _CAMEL_MIME_FILTER_CHARSET_H */
diff --git a/camel/camel-mime-filter-crlf.h b/camel/camel-mime-filter-crlf.h
index ec1f5a1..bb4b48d 100644
--- a/camel/camel-mime-filter-crlf.h
+++ b/camel/camel-mime-filter-crlf.h
@@ -64,4 +64,4 @@ CamelMimeFilter *camel_mime_filter_crlf_new (CamelMimeFilterCRLFDirection direct
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_CRLF_H */
+#endif /* _CAMEL_MIME_FILTER_CRLF_H */
diff --git a/camel/camel-mime-filter-from.h b/camel/camel-mime-filter-from.h
index 3ec0f23..b4b3f0d 100644
--- a/camel/camel-mime-filter-from.h
+++ b/camel/camel-mime-filter-from.h
@@ -48,4 +48,4 @@ CamelMimeFilterFrom *camel_mime_filter_from_new (void);
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_FROM_H */
+#endif /* _CAMEL_MIME_FILTER_FROM_H */
diff --git a/camel/camel-mime-filter-html.h b/camel/camel-mime-filter-html.h
index abe71fe..210d268 100644
--- a/camel/camel-mime-filter-html.h
+++ b/camel/camel-mime-filter-html.h
@@ -48,4 +48,4 @@ CamelMimeFilterHTML *camel_mime_filter_html_new (void);
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_HTML_H */
+#endif /* _CAMEL_MIME_FILTER_HTML_H */
diff --git a/camel/camel-mime-filter-index.h b/camel/camel-mime-filter-index.h
index a39369f..a55ac36 100644
--- a/camel/camel-mime-filter-index.h
+++ b/camel/camel-mime-filter-index.h
@@ -56,4 +56,4 @@ void camel_mime_filter_index_set_index (CamelMimeFilterIndex *filter, struct _Ca
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_INDEX_H */
+#endif /* _CAMEL_MIME_FILTER_INDEX_H */
diff --git a/camel/camel-mime-filter-linewrap.h b/camel/camel-mime-filter-linewrap.h
index fada920..302d86c 100644
--- a/camel/camel-mime-filter-linewrap.h
+++ b/camel/camel-mime-filter-linewrap.h
@@ -58,4 +58,4 @@ CamelMimeFilter *camel_mime_filter_linewrap_new (guint preferred_len, guint max_
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_LINEWRAP_H */
+#endif /* _CAMEL_MIME_FILTER_LINEWRAP_H */
diff --git a/camel/camel-mime-filter-pgp.h b/camel/camel-mime-filter-pgp.h
index 852d15c..2da1b15 100644
--- a/camel/camel-mime-filter-pgp.h
+++ b/camel/camel-mime-filter-pgp.h
@@ -46,4 +46,4 @@ CamelMimeFilter *camel_mime_filter_pgp_new(void);
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_PGP_H */
+#endif /* _CAMEL_MIME_FILTER_PGP_H */
diff --git a/camel/camel-mime-filter.h b/camel/camel-mime-filter.h
index 4849829..b36b8d2 100644
--- a/camel/camel-mime-filter.h
+++ b/camel/camel-mime-filter.h
@@ -86,4 +86,4 @@ void camel_mime_filter_set_size(CamelMimeFilter *filter, gsize size, gint keep);
G_END_DECLS
-#endif /* ! _CAMEL_MIME_FILTER_H */
+#endif /* _CAMEL_MIME_FILTER_H */
diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c
index 11005d9..ca5e336 100644
--- a/camel/camel-mime-message.c
+++ b/camel/camel-mime-message.c
@@ -1179,7 +1179,7 @@ find_attachment (CamelMimeMessage *msg, CamelMimePart *part, gpointer data)
}
}
- return ! (*found);
+ return !(*found);
}
/**
diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c
index e851ee7..b527d19 100644
--- a/camel/camel-mime-parser.c
+++ b/camel/camel-mime-parser.c
@@ -1585,7 +1585,7 @@ tail_recurse:
#else
case CAMEL_MIME_PARSER_STATE_INITIAL:
case CAMEL_MIME_PARSER_STATE_PRE_FROM:
-#endif /* !USE_FROM */
+#endif /* USE_FROM */
scan_header:
case CAMEL_MIME_PARSER_STATE_FROM:
diff --git a/camel/camel-mime-parser.h b/camel/camel-mime-parser.h
index c078712..8d3ad79 100644
--- a/camel/camel-mime-parser.h
+++ b/camel/camel-mime-parser.h
@@ -139,4 +139,4 @@ off_t camel_mime_parser_tell_start_boundary(CamelMimeParser *parser);
G_END_DECLS
-#endif /* ! _CAMEL_MIME_PARSER_H */
+#endif /* _CAMEL_MIME_PARSER_H */
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index d3abbd2..51cb654 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -3314,7 +3314,7 @@ header_encode_param (const guchar *in, gboolean *encoded, gboolean is_filename)
out = g_string_new (charset);
g_string_append(out, "''");
- while ( (c = *inptr++) ) {
+ while ((c = *inptr++)) {
if (camel_mime_is_attrchar(c))
g_string_append_c (out, c);
else
@@ -4234,7 +4234,7 @@ camel_header_location_decode(const gchar *in)
quote = 1;
}
- while ( (c = *in++) ) {
+ while ((c = *in++)) {
if (quote && c=='"')
break;
if (!camel_mime_is_lwsp(c))
diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h
index 722576e..67ba101 100644
--- a/camel/camel-mime-utils.h
+++ b/camel/camel-mime-utils.h
@@ -283,4 +283,4 @@ extern unsigned short camel_mime_special_table[256];
G_END_DECLS
-#endif /* ! _CAMEL_MIME_UTILS_H */
+#endif /* _CAMEL_MIME_UTILS_H */
diff --git a/camel/camel-news-address.h b/camel/camel-news-address.h
index 5f6b90c..2e2bcd5 100644
--- a/camel/camel-news-address.h
+++ b/camel/camel-news-address.h
@@ -49,6 +49,6 @@ CamelNewsAddress *camel_news_address_new (void);
G_END_DECLS
-#endif /* ! _CAMEL_NEWS_ADDRESS_H */
+#endif /* _CAMEL_NEWS_ADDRESS_H */
#endif /* CAMEL_DISABLE_DEPRECATED */
diff --git a/camel/camel-nntp-address.h b/camel/camel-nntp-address.h
index 2dde5d8..34ad9d3 100644
--- a/camel/camel-nntp-address.h
+++ b/camel/camel-nntp-address.h
@@ -51,4 +51,4 @@ gboolean camel_nntp_address_get (const CamelNNTPAddress *a, gint index, const g
G_END_DECLS
-#endif /* ! _CAMEL_NNTP_ADDRESS_H */
+#endif /* _CAMEL_NNTP_ADDRESS_H */
diff --git a/camel/camel-partition-table.c b/camel/camel-partition-table.c
index f721a34..bec514b 100644
--- a/camel/camel-partition-table.c
+++ b/camel/camel-partition-table.c
@@ -179,7 +179,7 @@ static CamelBlock *find_partition(CamelPartitionTable *cpi, camel_hash_t id, gin
bl = bl->next;
}
- g_warning("could not find a partition that could fit ! partition table corrupt!");
+ g_warning("could not find a partition that could fit !partition table corrupt!");
/* This should never be reached */
diff --git a/camel/camel-partition-table.h b/camel/camel-partition-table.h
index 92c4419..4bfcd98 100644
--- a/camel/camel-partition-table.h
+++ b/camel/camel-partition-table.h
@@ -153,4 +153,4 @@ camel_key_t camel_key_table_next(CamelKeyTable *ki, camel_key_t next, gchar **ke
G_END_DECLS
-#endif /* ! _CAMEL_PARTITION_TABLE_H */
+#endif /* _CAMEL_PARTITION_TABLE_H */
diff --git a/camel/camel-search-private.h b/camel/camel-search-private.h
index 3ab4fd2..e927e41 100644
--- a/camel/camel-search-private.h
+++ b/camel/camel-search-private.h
@@ -89,4 +89,4 @@ void camel_search_words_free(struct _camel_search_words *);
G_END_DECLS
-#endif /* ! _CAMEL_SEARCH_PRIVATE_H */
+#endif /* _CAMEL_SEARCH_PRIVATE_H */
diff --git a/camel/camel-search-sql-sexp.h b/camel/camel-search-sql-sexp.h
index acce35c..56078ba 100644
--- a/camel/camel-search-sql-sexp.h
+++ b/camel/camel-search-sql-sexp.h
@@ -29,4 +29,4 @@ gchar * camel_sexp_to_sql_sexp (const gchar *sexp);
G_END_DECLS
-#endif /* ! _CAMEL_SEARCH_SQL_H */
+#endif /* _CAMEL_SEARCH_SQL_H */
diff --git a/camel/camel-search-sql.h b/camel/camel-search-sql.h
index f7421d3..ba741c1 100644
--- a/camel/camel-search-sql.h
+++ b/camel/camel-search-sql.h
@@ -28,4 +28,4 @@ gchar * camel_sexp_to_sql (const gchar *sexp);
G_END_DECLS
-#endif /* ! _CAMEL_SEARCH_SQL_H */
+#endif /* _CAMEL_SEARCH_SQL_H */
diff --git a/camel/camel-store-summary.c b/camel/camel-store-summary.c
index 48eb2bd..41807b8 100644
--- a/camel/camel-store-summary.c
+++ b/camel/camel-store-summary.c
@@ -430,7 +430,7 @@ camel_store_summary_save(CamelStoreSummary *s)
}
out = fdopen(fd, "wb");
- if ( out == NULL ) {
+ if (out == NULL) {
i = errno;
printf("** fdopen error: %s\n", g_strerror (errno));
close(fd);
diff --git a/camel/camel-store-summary.h b/camel/camel-store-summary.h
index 1a79f00..a042478 100644
--- a/camel/camel-store-summary.h
+++ b/camel/camel-store-summary.h
@@ -180,4 +180,4 @@ void camel_store_info_set_string(CamelStoreSummary *summary, CamelStoreInfo *inf
G_END_DECLS
-#endif /* ! _CAMEL_STORE_SUMMARY_H */
+#endif /* _CAMEL_STORE_SUMMARY_H */
diff --git a/camel/camel-stream-filter.h b/camel/camel-stream-filter.h
index e8b1701..05ee7ff 100644
--- a/camel/camel-stream-filter.h
+++ b/camel/camel-stream-filter.h
@@ -54,4 +54,4 @@ void camel_stream_filter_remove (CamelStreamFilter *stream, gint id);
G_END_DECLS
-#endif /* ! _CAMEL_STREAM_FILTER_H */
+#endif /* _CAMEL_STREAM_FILTER_H */
diff --git a/camel/camel-stream-null.h b/camel/camel-stream-null.h
index 46e3d3b..d443a9d 100644
--- a/camel/camel-stream-null.h
+++ b/camel/camel-stream-null.h
@@ -48,4 +48,4 @@ CamelStream *camel_stream_null_new (void);
G_END_DECLS
-#endif /* ! _CAMEL_STREAM_NULL_H */
+#endif /* _CAMEL_STREAM_NULL_H */
diff --git a/camel/camel-stream-process.h b/camel/camel-stream-process.h
index 4c435cd..68fa101 100644
--- a/camel/camel-stream-process.h
+++ b/camel/camel-stream-process.h
@@ -50,4 +50,4 @@ gint camel_stream_process_connect(CamelStreamProcess *, const gchar *, const gch
G_END_DECLS
-#endif /* ! _CAMEL_STREAM_PROCESS_H */
+#endif /* _CAMEL_STREAM_PROCESS_H */
diff --git a/camel/camel-text-index.c b/camel/camel-text-index.c
index 8b9bb42..5dce85a 100644
--- a/camel/camel-text-index.c
+++ b/camel/camel-text-index.c
@@ -280,7 +280,7 @@ text_index_sync(CamelIndex *idx)
work = !camel_dlist_empty(&p->word_cache);
- while ( (ww = (struct _CamelTextIndexWord *)camel_dlist_remhead(&p->word_cache)) ) {
+ while ((ww = (struct _CamelTextIndexWord *)camel_dlist_remhead(&p->word_cache))) {
if (ww->used > 0) {
io(printf("writing key file entry '%s' [%x]\n", ww->word, ww->data));
if (camel_key_file_write(p->links, &ww->data, ww->used, ww->names) != -1) {
@@ -415,7 +415,7 @@ text_index_compress_nosync(CamelIndex *idx)
remap = g_hash_table_new(NULL, NULL);
oldkeyid = 0;
deleted = 0;
- while ( (oldkeyid = camel_key_table_next(oldp->name_index, oldkeyid, &name, &flags, &data)) ) {
+ while ((oldkeyid = camel_key_table_next(oldp->name_index, oldkeyid, &name, &flags, &data))) {
if ((flags&1) == 0) {
io(printf("copying name '%s'\n", name));
newkeyid = camel_key_table_add(newp->name_index, name, data, flags);
@@ -436,7 +436,7 @@ text_index_compress_nosync(CamelIndex *idx)
/* We re-block the data into 256 entry lots while we're at it, since we only
have to do 1 at a time and its cheap */
oldkeyid = 0;
- while ( (oldkeyid = camel_key_table_next(oldp->word_index, oldkeyid, &name, &flags, &data)) ) {
+ while ((oldkeyid = camel_key_table_next(oldp->word_index, oldkeyid, &name, &flags, &data))) {
io(printf("copying word '%s'\n", name));
newdata = 0;
newcount = 0;
@@ -1210,7 +1210,7 @@ camel_text_index_dump(CamelTextIndex *idx)
printf("UID's in index\n");
keyid = 0;
- while ( (keyid = camel_key_table_next(p->name_index, keyid, &word, &flags, &data)) ) {
+ while ((keyid = camel_key_table_next(p->name_index, keyid, &word, &flags, &data))) {
if ((flags & 1) == 0)
printf(" %s\n", word);
else
@@ -1221,13 +1221,13 @@ camel_text_index_dump(CamelTextIndex *idx)
printf("Word's in index\n");
keyid = 0;
- while ( (keyid = camel_key_table_next(p->word_index, keyid, &word, &flags, &data)) ) {
+ while ((keyid = camel_key_table_next(p->word_index, keyid, &word, &flags, &data))) {
CamelIndexCursor *idc;
printf("Word: '%s':\n", word);
idc = camel_index_find((CamelIndex *)idx, word);
- while ( (name = camel_index_cursor_next(idc)) ) {
+ while ((name = camel_index_cursor_next(idc))) {
printf(" %s", name);
}
printf("\n");
@@ -1283,7 +1283,7 @@ camel_text_index_validate(CamelTextIndex *idx)
printf("Checking UID consistency\n");
keyid = 0;
- while ( (keyid = camel_key_table_next(p->name_index, keyid, &word, &flags, &data)) ) {
+ while ((keyid = camel_key_table_next(p->name_index, keyid, &word, &flags, &data))) {
if ((oldword = g_hash_table_lookup(names, GINT_TO_POINTER(keyid))) != NULL
|| (oldword = g_hash_table_lookup(deleted, GINT_TO_POINTER(keyid))) != NULL) {
printf("Warning, name '%s' duplicates key (%x) with name '%s'\n", word, keyid, oldword);
@@ -1301,7 +1301,7 @@ camel_text_index_validate(CamelTextIndex *idx)
printf("Checking WORD member consistency\n");
keyid = 0;
- while ( (keyid = camel_key_table_next(p->word_index, keyid, &word, &flags, &data)) ) {
+ while ((keyid = camel_key_table_next(p->word_index, keyid, &word, &flags, &data))) {
CamelIndexCursor *idc;
GHashTable *used;
@@ -1335,7 +1335,7 @@ camel_text_index_validate(CamelTextIndex *idx)
used = g_hash_table_new(g_str_hash, g_str_equal);
idc = camel_index_find((CamelIndex *)idx, word);
- while ( (name = camel_index_cursor_next(idc)) ) {
+ while ((name = camel_index_cursor_next(idc))) {
if (g_hash_table_lookup(name_word, name) == NULL) {
printf("word '%s' references non-existant name '%s'\n", word, name);
}
@@ -1412,7 +1412,7 @@ camel_utf8_next(const guchar **ptr, const guchar *ptrend)
if (p == ptrend)
return 0;
- while ( (c = *p++) ) {
+ while ((c = *p++)) {
if (c < 0x80) {
*ptr = p;
return c;
@@ -1705,7 +1705,7 @@ text_index_key_cursor_next(CamelIndexCursor *idc)
g_free(p->current);
p->current = NULL;
- while ( (p->keyid = camel_key_table_next(p->table, p->keyid, &p->current, &p->flags, &p->data)) ) {
+ while ((p->keyid = camel_key_table_next(p->table, p->keyid, &p->current, &p->flags, &p->data))) {
if ((p->flags & 1) == 0) {
return p->current;
} else {
@@ -1862,7 +1862,7 @@ gint main(gint argc, gchar **argv)
printf("Looking up which names contain word 'word'\n");
idc = camel_index_find(idx, "words");
- while ( (word = camel_index_cursor_next(idc)) != NULL ) {
+ while ((word = camel_index_cursor_next(idc)) != NULL) {
printf(" name is '%s'\n", word);
}
camel_object_unref((CamelObject *)idc);
@@ -1870,7 +1870,7 @@ gint main(gint argc, gchar **argv)
printf("Looking up which names contain word 'truncate'\n");
idc = camel_index_find(idx, "truncate");
- while ( (word = camel_index_cursor_next(idc)) != NULL ) {
+ while ((word = camel_index_cursor_next(idc)) != NULL) {
printf(" name is '%s'\n", word);
}
camel_object_unref((CamelObject *)idc);
diff --git a/camel/camel-text-index.h b/camel/camel-text-index.h
index 01b0078..187a156 100644
--- a/camel/camel-text-index.h
+++ b/camel/camel-text-index.h
@@ -114,4 +114,4 @@ void camel_text_index_validate(CamelTextIndex *idx);
G_END_DECLS
-#endif /* ! _CAMEL_TEXT_INDEX_H */
+#endif /* _CAMEL_TEXT_INDEX_H */
diff --git a/camel/camel-utf8.c b/camel/camel-utf8.c
index 44c5426..4e6da15 100644
--- a/camel/camel-utf8.c
+++ b/camel/camel-utf8.c
@@ -306,7 +306,7 @@ camel_utf8_utf7(const gchar *ptr)
out = g_string_new("");
- while ( (c = camel_utf8_getc(&p)) ) {
+ while ((c = camel_utf8_getc(&p))) {
if (c >= 0x20 && c <= 0x7e) {
if (state == 1) {
utf7_closeb64(out, v, i);
@@ -360,7 +360,7 @@ camel_utf8_ucs2(const gchar *pptr)
/* what if c is > 0xffff ? */
- while ( (c = camel_utf8_getc(&ptr)) ) {
+ while ((c = camel_utf8_getc(&ptr))) {
guint16 s = g_htons(c);
g_byte_array_append(work, (guchar *) &s, 2);
@@ -390,7 +390,7 @@ gchar *camel_ucs2_utf8(const gchar *ptr)
GString *work = g_string_new("");
gchar *out;
- while ( (c = *ucs++) )
+ while ((c = *ucs++))
g_string_append_u(work, g_ntohs(c));
out = g_strdup(work->str);
diff --git a/camel/camel-utf8.h b/camel/camel-utf8.h
index 24c7221..63f251e 100644
--- a/camel/camel-utf8.h
+++ b/camel/camel-utf8.h
@@ -45,4 +45,4 @@ gchar *camel_utf8_make_valid (const gchar *text);
G_END_DECLS
-#endif /* ! _CAMEL_UTF8_H */
+#endif /* _CAMEL_UTF8_H */
diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index 903fa98..e98fe83 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -2078,7 +2078,7 @@ vf_getv(CamelObject *object, CamelException *ex, CamelArgGetV *args)
deleted++;
if (flags & CAMEL_MESSAGE_JUNK) {
junked++;
- if (! (flags & CAMEL_MESSAGE_DELETED))
+ if (!(flags & CAMEL_MESSAGE_DELETED))
junked_not_deleted++;
}
if ((flags & (CAMEL_MESSAGE_DELETED|CAMEL_MESSAGE_JUNK)) == 0)
diff --git a/camel/camel-vee-folder.h b/camel/camel-vee-folder.h
index 7a38428..0778f38 100644
--- a/camel/camel-vee-folder.h
+++ b/camel/camel-vee-folder.h
@@ -94,4 +94,4 @@ void camel_vee_folder_sync_headers (CamelFolder *vf, CamelException *ex);
G_END_DECLS
-#endif /* ! _CAMEL_VEE_FOLDER_H */
+#endif /* _CAMEL_VEE_FOLDER_H */
diff --git a/camel/camel-vee-store.h b/camel/camel-vee-store.h
index ecbd2a0..1921560 100644
--- a/camel/camel-vee-store.h
+++ b/camel/camel-vee-store.h
@@ -55,4 +55,4 @@ CamelVeeStore *camel_vee_store_new (void);
G_END_DECLS
-#endif /* ! _CAMEL_VEE_STORE_H */
+#endif /* _CAMEL_VEE_STORE_H */
diff --git a/camel/camel-vee-summary.h b/camel/camel-vee-summary.h
index 4718727..fcafadb 100644
--- a/camel/camel-vee-summary.h
+++ b/camel/camel-vee-summary.h
@@ -66,5 +66,5 @@ void camel_vee_summary_load_check_unread_vfolder (CamelVeeSummary *vs);
G_END_DECLS
-#endif /* ! _CAMEL_VEE_SUMMARY_H */
+#endif /* _CAMEL_VEE_SUMMARY_H */
diff --git a/camel/camel-vtrash-folder.c b/camel/camel-vtrash-folder.c
index 2383e03..6e43edc 100644
--- a/camel/camel-vtrash-folder.c
+++ b/camel/camel-vtrash-folder.c
@@ -159,7 +159,7 @@ vtrash_getv(CamelObject *object, CamelException *ex, CamelArgGetV *args)
deleted++;
if (flags & CAMEL_MESSAGE_JUNK) {
junked++;
- if (! (flags & CAMEL_MESSAGE_DELETED))
+ if (!(flags & CAMEL_MESSAGE_DELETED))
junked_not_deleted++;
}
if ((flags & (CAMEL_MESSAGE_DELETED|CAMEL_MESSAGE_JUNK)) == 0)
diff --git a/camel/camel-vtrash-folder.h b/camel/camel-vtrash-folder.h
index 815327d..0707190 100644
--- a/camel/camel-vtrash-folder.h
+++ b/camel/camel-vtrash-folder.h
@@ -62,4 +62,4 @@ CamelFolder *camel_vtrash_folder_new (CamelStore *parent_store, camel_vtrash
G_END_DECLS
-#endif /* ! _CAMEL_VTRASH_FOLDER_H */
+#endif /* _CAMEL_VTRASH_FOLDER_H */
diff --git a/camel/db-scrap-tools/db.c b/camel/db-scrap-tools/db.c
index bf97c05..dcd73a5 100644
--- a/camel/db-scrap-tools/db.c
+++ b/camel/db-scrap-tools/db.c
@@ -82,7 +82,7 @@ gint main(gint argc, gchar **argv) {
// rc = sqlite3_open_v2("test.db", &db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE , NULL);
rc = sqlite3_open("test.db", &db);
- if ( rc ) {
+ if (rc) {
fprintf(stderr, "Can't open database: %s\n", sqlite3_errmsg(db));
sqlite3_close(db);
exit(1);
diff --git a/camel/providers/groupwise/camel-groupwise-folder.c b/camel/providers/groupwise/camel-groupwise-folder.c
index 61d6dff..a973c0d 100644
--- a/camel/providers/groupwise/camel-groupwise-folder.c
+++ b/camel/providers/groupwise/camel-groupwise-folder.c
@@ -1351,7 +1351,7 @@ groupwise_refresh_folder(CamelFolder *folder, CamelException *ex)
if (!is_proxy) {
const gchar *source;
- if ( !strcmp (folder->full_name, RECEIVED) || !strcmp(folder->full_name, SENT) ) {
+ if (!strcmp (folder->full_name, RECEIVED) || !strcmp(folder->full_name, SENT)) {
source = NULL;
} else {
source = "sent received";
@@ -2161,7 +2161,7 @@ groupwise_folder_item_to_msg( CamelFolder *folder,
!g_ascii_strcasecmp (attach->name, "meeting.ics")) && (attach->hidden == TRUE))
continue;
- if ( (attach->item_reference) && (!g_ascii_strcasecmp (attach->item_reference, "1")) ) {
+ if ((attach->item_reference) && (!g_ascii_strcasecmp (attach->item_reference, "1"))) {
CamelMimeMessage *temp_msg = NULL;
status = e_gw_connection_get_item (cnc, container_id, attach->id, GET_ITEM_VIEW_WITH_CACHE, &temp_item);
if (status != E_GW_CONNECTION_STATUS_OK) {
@@ -2502,7 +2502,7 @@ groupwise_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
break;
if (delete_originals) {
- if ( !strcmp(source->full_name, SENT) ) {
+ if (!strcmp(source->full_name, SENT)) {
camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
_("This message is not available in offline mode."));
diff --git a/camel/providers/groupwise/camel-groupwise-store-summary.c b/camel/providers/groupwise/camel-groupwise-store-summary.c
index 8b833bf..32b194e 100644
--- a/camel/providers/groupwise/camel-groupwise-store-summary.c
+++ b/camel/providers/groupwise/camel-groupwise-store-summary.c
@@ -146,7 +146,7 @@ camel_groupwise_store_summary_full_to_path(CamelGroupwiseStoreSummary *s, const
if (dir_sep != '/') {
p = path = alloca(strlen(full_name)*3+1);
f = full_name;
- while ( (c = *f++ & 0xff) ) {
+ while ((c = *f++ & 0xff)) {
if (c == dir_sep)
*p++ = '/';
else if (c == '/' || c == '%')
@@ -258,7 +258,7 @@ camel_groupwise_store_summary_path_to_full(CamelGroupwiseStoreSummary *s, const
else
p = path;
- while ( (c = camel_utf8_getc((const guchar **)&p)) ) {
+ while ((c = camel_utf8_getc((const guchar **)&p))) {
switch (state) {
case 0:
if (c == '%')
diff --git a/camel/providers/groupwise/camel-groupwise-store-summary.h b/camel/providers/groupwise/camel-groupwise-store-summary.h
index 41ea304..642bf2a 100644
--- a/camel/providers/groupwise/camel-groupwise-store-summary.h
+++ b/camel/providers/groupwise/camel-groupwise-store-summary.h
@@ -86,4 +86,4 @@ void camel_groupwise_store_summary_namespace_set(CamelGroupwiseStoreSummary *s,
G_END_DECLS
-#endif /* ! _CAMEL_IMAP_STORE_SUMMARY_H */
+#endif /* _CAMEL_IMAP_STORE_SUMMARY_H */
diff --git a/camel/providers/groupwise/camel-groupwise-store.c b/camel/providers/groupwise/camel-groupwise-store.c
index 90aa3ee..10121a8 100644
--- a/camel/providers/groupwise/camel-groupwise-store.c
+++ b/camel/providers/groupwise/camel-groupwise-store.c
@@ -1002,7 +1002,7 @@ groupwise_folders_sync (CamelGroupwiseStore *store, CamelException *ex)
if (e_gw_container_is_root(container))
continue;
- if ( (type == E_GW_CONTAINER_TYPE_CALENDAR) || (type == E_GW_CONTAINER_TYPE_CONTACTS) )
+ if ((type == E_GW_CONTAINER_TYPE_CALENDAR) || (type == E_GW_CONTAINER_TYPE_CONTACTS))
continue;
info = convert_to_folder_info (store, E_GW_CONTAINER (folder_list->data), (const gchar *)url, ex);
diff --git a/camel/providers/groupwise/camel-groupwise-utils.c b/camel/providers/groupwise/camel-groupwise-utils.c
index 8a48641..ca52f36 100644
--- a/camel/providers/groupwise/camel-groupwise-utils.c
+++ b/camel/providers/groupwise/camel-groupwise-utils.c
@@ -177,7 +177,7 @@ find_folders_recursive (const gchar *physical_path, const gchar *path,
file_path = g_strdup_printf ("%s/%s", subfolder_directory_path, dirent);
if (g_stat (file_path, &file_stat) < 0 ||
- ! S_ISDIR (file_stat.st_mode)) {
+ !S_ISDIR (file_stat.st_mode)) {
g_free (file_path);
continue;
}
diff --git a/camel/providers/imap/camel-imap-search.c b/camel/providers/imap/camel-imap-search.c
index eadef34..8f7dfb3 100644
--- a/camel/providers/imap/camel-imap-search.c
+++ b/camel/providers/imap/camel-imap-search.c
@@ -123,7 +123,7 @@ camel_imap_search_finalise(CamelImapSearch *is)
{
struct _match_record *mr;
- while ( (mr = (struct _match_record *)camel_dlist_remtail(&is->matches)) )
+ while ((mr = (struct _match_record *)camel_dlist_remtail(&is->matches)))
free_match(is, mr);
g_hash_table_destroy(is->matches_hash);
if (is->cache)
diff --git a/camel/providers/imap/camel-imap-search.h b/camel/providers/imap/camel-imap-search.h
index afe4e2b..039db8a 100644
--- a/camel/providers/imap/camel-imap-search.h
+++ b/camel/providers/imap/camel-imap-search.h
@@ -63,4 +63,4 @@ CamelFolderSearch *camel_imap_search_new (const gchar *cachedir);
G_END_DECLS
-#endif /* ! _CAMEL_IMAP_SEARCH_H */
+#endif /* _CAMEL_IMAP_SEARCH_H */
diff --git a/camel/providers/imap/camel-imap-store-summary.c b/camel/providers/imap/camel-imap-store-summary.c
index ac0c223..4216060 100644
--- a/camel/providers/imap/camel-imap-store-summary.c
+++ b/camel/providers/imap/camel-imap-store-summary.c
@@ -177,7 +177,7 @@ camel_imap_store_summary_full_to_path(CamelImapStoreSummary *s, const gchar *ful
if (dir_sep != '/') {
p = path = alloca(strlen(full_name)*3+1);
f = full_name;
- while ( (c = *f++ & 0xff) ) {
+ while ((c = *f++ & 0xff)) {
if (c == dir_sep)
*p++ = '/';
else if (c == '/' || c == '%')
diff --git a/camel/providers/imap/camel-imap-store-summary.h b/camel/providers/imap/camel-imap-store-summary.h
index fe5123a..b3f4a32 100644
--- a/camel/providers/imap/camel-imap-store-summary.h
+++ b/camel/providers/imap/camel-imap-store-summary.h
@@ -95,4 +95,4 @@ gchar *camel_imap_store_summary_full_from_path(CamelImapStoreSummary *s, const g
G_END_DECLS
-#endif /* ! _CAMEL_IMAP_STORE_SUMMARY_H */
+#endif /* _CAMEL_IMAP_STORE_SUMMARY_H */
diff --git a/camel/providers/imap/camel-imap-summary.h b/camel/providers/imap/camel-imap-summary.h
index 4145435..2de45be 100644
--- a/camel/providers/imap/camel-imap-summary.h
+++ b/camel/providers/imap/camel-imap-summary.h
@@ -82,4 +82,4 @@ void camel_imap_summary_add_offline_uncached (CamelFolderSummary *summary,
G_END_DECLS
-#endif /* ! _CAMEL_IMAP_SUMMARY_H */
+#endif /* _CAMEL_IMAP_SUMMARY_H */
diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c
index e6f6a3c..89ff01a 100644
--- a/camel/providers/imap/camel-imap-utils.c
+++ b/camel/providers/imap/camel-imap-utils.c
@@ -1448,7 +1448,7 @@ find_folders_recursive (const gchar *physical_path, const gchar *path,
dirent);
if (g_stat (file_path, &file_stat) < 0 ||
- ! S_ISDIR (file_stat.st_mode)) {
+ !S_ISDIR (file_stat.st_mode)) {
g_free (file_path);
continue;
}
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 1460f7d..27a2f25 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -467,7 +467,7 @@ imapx_command_addv(CamelIMAPXCommand *ic, const gchar *fmt, va_list ap)
p = fmt;
ps = fmt;
- while ( ( c = *p++ ) ) {
+ while (( c = *p++ )) {
switch (c) {
case '%':
if (*p == '%') {
@@ -663,7 +663,7 @@ camel_imapx_command_free(CamelIMAPXCommand *ic)
imap_free_status(ic->status);
g_free(ic->select);
- while ( (cp = ((CamelIMAPXCommandPart *)camel_dlist_remhead(&ic->parts))) ) {
+ while ((cp = ((CamelIMAPXCommandPart *)camel_dlist_remhead(&ic->parts)))) {
g_free(cp->data);
if (cp->ob) {
switch (cp->type & CAMEL_IMAPX_COMMAND_MASK) {
@@ -3031,7 +3031,7 @@ imapx_parser_thread (gpointer d)
op = camel_operation_new (NULL, NULL);
op = camel_operation_register (op);
while (TRUE) {
-
+
CAMEL_SERVICE_REC_LOCK (is->store, connect_lock);
if (!is->stream)
imapx_reconnect(is, &ex);
diff --git a/camel/providers/imapx/camel-imapx-server.h b/camel/providers/imapx/camel-imapx-server.h
index 6d88491..856238d 100644
--- a/camel/providers/imapx/camel-imapx-server.h
+++ b/camel/providers/imapx/camel-imapx-server.h
@@ -116,4 +116,4 @@ void camel_imapx_server_noop (CamelIMAPXServer *is, CamelFolder *folder, CamelEx
CamelStream *camel_imapx_server_get_message(CamelIMAPXServer *is, CamelFolder *folder, const gchar *uid, struct _CamelException *ex);
void camel_imapx_server_append_message(CamelIMAPXServer *is, CamelFolder *folder, struct _CamelMimeMessage *message, const struct _CamelMessageInfo *mi, CamelException *ex);
-#endif /* ! _CAMEL_IMAPX_SERVER_H */
+#endif /* _CAMEL_IMAPX_SERVER_H */
diff --git a/camel/providers/imapx/camel-imapx-store-summary.c b/camel/providers/imapx/camel-imapx-store-summary.c
index 1b236ae..01ec307 100644
--- a/camel/providers/imapx/camel-imapx-store-summary.c
+++ b/camel/providers/imapx/camel-imapx-store-summary.c
@@ -177,7 +177,7 @@ camel_imapx_store_summary_full_to_path(CamelIMAPXStoreSummary *s, const gchar *f
if (dir_sep != '/') {
p = path = alloca(strlen(full_name)*3+1);
f = full_name;
- while ( (c = *f++ & 0xff) ) {
+ while ((c = *f++ & 0xff)) {
if (c == dir_sep)
*p++ = '/';
else if (c == '/' || c == '%')
diff --git a/camel/providers/imapx/camel-imapx-store-summary.h b/camel/providers/imapx/camel-imapx-store-summary.h
index 0eeca45..67f4004 100644
--- a/camel/providers/imapx/camel-imapx-store-summary.h
+++ b/camel/providers/imapx/camel-imapx-store-summary.h
@@ -102,4 +102,4 @@ void camel_imapx_store_summary_set_namespaces (CamelIMAPXStoreSummary *summary,
G_END_DECLS
-#endif /* ! _CAMEL_IMAP_STORE_SUMMARY_H */
+#endif /* _CAMEL_IMAP_STORE_SUMMARY_H */
diff --git a/camel/providers/imapx/camel-imapx-stream.h b/camel/providers/imapx/camel-imapx-stream.h
index a98ff6d..8a8ce67 100644
--- a/camel/providers/imapx/camel-imapx-stream.h
+++ b/camel/providers/imapx/camel-imapx-stream.h
@@ -92,4 +92,4 @@ guint32 camel_imapx_stream_number(CamelIMAPXStream *is, CamelException *ex);
/* skips the rest of a line, including literals, etc */
gint camel_imapx_stream_skip(CamelIMAPXStream *is, CamelException *ex);
-#endif /* ! _CAMEL_IMAPX_STREAM_H */
+#endif /* _CAMEL_IMAPX_STREAM_H */
diff --git a/camel/providers/imapx/camel-imapx-summary.h b/camel/providers/imapx/camel-imapx-summary.h
index 06f5b29..f6078b6 100644
--- a/camel/providers/imapx/camel-imapx-summary.h
+++ b/camel/providers/imapx/camel-imapx-summary.h
@@ -80,4 +80,4 @@ void camel_imapx_summary_add_offline_uncached (CamelFolderSummary *summary,
G_END_DECLS
-#endif /* ! _CAMEL_IMAPX_SUMMARY_H */
+#endif /* _CAMEL_IMAPX_SUMMARY_H */
diff --git a/camel/providers/imapx/camel-imapx-utils.c b/camel/providers/imapx/camel-imapx-utils.c
index b5707af..5c0e16f 100644
--- a/camel/providers/imapx/camel-imapx-utils.c
+++ b/camel/providers/imapx/camel-imapx-utils.c
@@ -1364,7 +1364,7 @@ imap_parse_fetch(CamelIMAPXStream *is, CamelException *ex)
return NULL;
}
- while ( (tok = camel_imapx_stream_token(is, &token, &len, ex)) == IMAP_TOK_TOKEN ) {
+ while ((tok = camel_imapx_stream_token(is, &token, &len, ex)) == IMAP_TOK_TOKEN) {
p = token;
while ((c=*p))
@@ -1469,7 +1469,7 @@ imap_parse_status_info (struct _CamelIMAPXStream *is, CamelException *ex)
return NULL;
}
- while ( (tok = camel_imapx_stream_token(is, &token, &len, ex)) == IMAP_TOK_TOKEN ) {
+ while ((tok = camel_imapx_stream_token(is, &token, &len, ex)) == IMAP_TOK_TOKEN) {
switch (imap_tokenise((gchar *) token, len)) {
case IMAP_MESSAGES:
sinfo->messages = camel_imapx_stream_number (is, ex);
@@ -1669,7 +1669,7 @@ imap_parse_list(CamelIMAPXStream *is, CamelException *ex)
return NULL;
}
- while ( (tok = camel_imapx_stream_token(is, &token, &len, ex)) != ')' ) {
+ while ((tok = camel_imapx_stream_token(is, &token, &len, ex)) != ')') {
if (tok == IMAP_TOK_STRING || tok == IMAP_TOK_TOKEN) {
p = token;
while ((c=*p))
@@ -1702,7 +1702,7 @@ imapx_list_get_path(struct _list_info *li)
if (li->separator != 0 && li->separator != '/') {
p = path = alloca(strlen(li->name)*3+1);
f = li->name;
- while ( (c = *f++ & 0xff) ) {
+ while ((c = *f++ & 0xff)) {
if (c == li->separator)
*p++ = '/';
else if (c == '/' || c == '%')
diff --git a/camel/providers/imapx/camel-imapx-view-summary.h b/camel/providers/imapx/camel-imapx-view-summary.h
index 5c30bbd..eb33ccd 100644
--- a/camel/providers/imapx/camel-imapx-view-summary.h
+++ b/camel/providers/imapx/camel-imapx-view-summary.h
@@ -59,5 +59,5 @@ CamelIMAPXViewSummary *camel_imapx_view_summary_new (const gchar *base, Cam
guint32 camel_imapx_view_next_uid(CamelIMAPXView *view);
void camel_imapx_view_last_uid(CamelIMAPXView *view, guint32 uid);
-#endif /* ! _CAMEL_IMAPX_VIEW_SUMMARY_H */
+#endif /* _CAMEL_IMAPX_VIEW_SUMMARY_H */
diff --git a/camel/providers/local/camel-local-summary.h b/camel/providers/local/camel-local-summary.h
index f9cdcd1..0cd8a3a 100644
--- a/camel/providers/local/camel-local-summary.h
+++ b/camel/providers/local/camel-local-summary.h
@@ -97,4 +97,4 @@ gint camel_local_summary_write_headers(gint fd, struct _camel_header_raw *header
G_END_DECLS
-#endif /* ! _CAMEL_LOCAL_SUMMARY_H */
+#endif /* _CAMEL_LOCAL_SUMMARY_H */
diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
index 4921794..c1ca64a 100644
--- a/camel/providers/local/camel-maildir-store.c
+++ b/camel/providers/local/camel-maildir-store.c
@@ -247,7 +247,7 @@ static void delete_folder(CamelStore * store, const gchar *folder_name, CamelExc
/* for tmp (only), its contents is irrelevant */
dir = opendir(tmp);
if (dir) {
- while ( (d=readdir(dir)) ) {
+ while ((d=readdir(dir))) {
gchar *name = d->d_name, *file;
if (!strcmp(name, ".") || !strcmp(name, ".."))
@@ -442,7 +442,7 @@ scan_dirs(CamelStore *store, guint32 flags, CamelFolderInfo *topfi, CamelURL *ur
goto fail;
}
- while ( (d = readdir(dir)) ) {
+ while ((d = readdir(dir))) {
if (strcmp(d->d_name, "tmp") == 0
|| strcmp(d->d_name, "cur") == 0
|| strcmp(d->d_name, "new") == 0
diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c
index 8cc0c9e..347fc7e 100644
--- a/camel/providers/local/camel-maildir-summary.c
+++ b/camel/providers/local/camel-maildir-summary.c
@@ -438,7 +438,7 @@ static gint maildir_summary_load(CamelLocalSummary *cls, gint forceindex, CamelE
mds->priv->load_map = g_hash_table_new(g_str_hash, g_str_equal);
pool = e_mempool_new(1024, 512, E_MEMPOOL_ALIGN_BYTE);
- while ( (d = readdir(dir)) ) {
+ while ((d = readdir(dir))) {
if (d->d_name[0] == '.')
continue;
@@ -575,11 +575,11 @@ maildir_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changes, Ca
/* joy, use this to pre-count the total, so we can report progress meaningfully */
total = 0;
count = 0;
- while ( (d = readdir(dir)) )
+ while ((d = readdir(dir)))
total++;
rewinddir(dir);
- while ( (d = readdir(dir)) ) {
+ while ((d = readdir(dir))) {
gint pc = count * 100 / total;
camel_operation_progress(NULL, pc);
@@ -641,11 +641,11 @@ maildir_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changes, Ca
if (dir != NULL) {
total = 0;
count = 0;
- while ( (d = readdir(dir)) )
+ while ((d = readdir(dir)))
total++;
rewinddir(dir);
- while ( (d = readdir(dir)) ) {
+ while ((d = readdir(dir))) {
gchar *name, *newname, *destname, *destfilename;
gchar *src, *dest;
gint pc = count * 100 / total;
diff --git a/camel/providers/local/camel-maildir-summary.h b/camel/providers/local/camel-maildir-summary.h
index 223769e..1ce6e74 100644
--- a/camel/providers/local/camel-maildir-summary.h
+++ b/camel/providers/local/camel-maildir-summary.h
@@ -76,4 +76,4 @@ gint camel_maildir_summary_name_to_info(CamelMaildirMessageInfo *info, const gch
G_END_DECLS
-#endif /* ! _CAMEL_MAILDIR_SUMMARY_H */
+#endif /* _CAMEL_MAILDIR_SUMMARY_H */
diff --git a/camel/providers/local/camel-mbox-summary.h b/camel/providers/local/camel-mbox-summary.h
index 2fca130..4bd3a92 100644
--- a/camel/providers/local/camel-mbox-summary.h
+++ b/camel/providers/local/camel-mbox-summary.h
@@ -76,4 +76,4 @@ gint camel_mbox_summary_sync_mbox(CamelMboxSummary *cls, guint32 flags, CamelFol
G_END_DECLS
-#endif /* ! _CAMEL_MBOX_SUMMARY_H */
+#endif /* _CAMEL_MBOX_SUMMARY_H */
diff --git a/camel/providers/local/camel-mh-summary.c b/camel/providers/local/camel-mh-summary.c
index 81add38..80d5780 100644
--- a/camel/providers/local/camel-mh-summary.c
+++ b/camel/providers/local/camel-mh-summary.c
@@ -253,10 +253,10 @@ mh_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, Came
}
}
- while ( (d = readdir(dir)) ) {
+ while ((d = readdir(dir))) {
/* FIXME: also run stat to check for regular file */
p = d->d_name;
- while ( (c = *p++) ) {
+ while ((c = *p++)) {
if (!isdigit(c))
break;
}
diff --git a/camel/providers/local/camel-mh-summary.h b/camel/providers/local/camel-mh-summary.h
index 81d43a8..9b82734 100644
--- a/camel/providers/local/camel-mh-summary.h
+++ b/camel/providers/local/camel-mh-summary.h
@@ -53,4 +53,4 @@ CamelMhSummary *camel_mh_summary_new(struct _CamelFolder *, const gchar *filenam
G_END_DECLS
-#endif /* ! _CAMEL_MH_SUMMARY_H */
+#endif /* _CAMEL_MH_SUMMARY_H */
diff --git a/camel/providers/local/camel-spool-store.c b/camel/providers/local/camel-spool-store.c
index cfe033a..d82a031 100644
--- a/camel/providers/local/camel-spool-store.c
+++ b/camel/providers/local/camel-spool-store.c
@@ -350,7 +350,7 @@ static gint scan_dir(CamelStore *store, GHashTable *visited, gchar *root, const
parent = fi;
}
- while ( (d = readdir(dir)) ) {
+ while ((d = readdir(dir))) {
if (strcmp(d->d_name, ".") == 0
|| strcmp(d->d_name, "..") == 0)
continue;
diff --git a/camel/providers/local/camel-spool-summary.h b/camel/providers/local/camel-spool-summary.h
index f2137f1..2cae902 100644
--- a/camel/providers/local/camel-spool-summary.h
+++ b/camel/providers/local/camel-spool-summary.h
@@ -69,4 +69,4 @@ gint camel_spool_summary_write_headers(gint fd, struct _camel_header_raw *header
G_END_DECLS
-#endif /* ! _CAMEL_SPOOL_SUMMARY_H */
+#endif /* _CAMEL_SPOOL_SUMMARY_H */
diff --git a/camel/providers/nntp/camel-nntp-store-summary.h b/camel/providers/nntp/camel-nntp-store-summary.h
index 15ae705..10725f5 100644
--- a/camel/providers/nntp/camel-nntp-store-summary.h
+++ b/camel/providers/nntp/camel-nntp-store-summary.h
@@ -92,4 +92,4 @@ gchar *camel_nntp_store_summary_full_from_path(CamelNNTPStoreSummary *s, const g
G_END_DECLS
-#endif /* ! _CAMEL_NNTP_STORE_SUMMARY_H */
+#endif /* _CAMEL_NNTP_STORE_SUMMARY_H */
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index 200a09d..6e20bff 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -1378,7 +1378,7 @@ camel_nntp_command (CamelNNTPStore *store, CamelException *ex, CamelNNTPFolder *
&& !camel_service_connect (CAMEL_SERVICE (store), ex))
return -1;
- /* Check for unprocessed data, ! */
+ /* Check for unprocessed data, !*/
if (store->stream->mode == CAMEL_NNTP_STREAM_DATA) {
g_warning("Unprocessed data left in stream, flushing");
while (camel_nntp_stream_getd(store->stream, (guchar **)&p, &u) > 0)
diff --git a/camel/providers/nntp/camel-nntp-stream.h b/camel/providers/nntp/camel-nntp-stream.h
index 6d8ac33..0014211 100644
--- a/camel/providers/nntp/camel-nntp-stream.h
+++ b/camel/providers/nntp/camel-nntp-stream.h
@@ -66,4 +66,4 @@ gint camel_nntp_stream_getd (CamelNNTPStream *is, guchar **start, guint *len)
G_END_DECLS
-#endif /* ! _CAMEL_NNTP_STREAM_H */
+#endif /* _CAMEL_NNTP_STREAM_H */
diff --git a/camel/providers/nntp/camel-nntp-summary.h b/camel/providers/nntp/camel-nntp-summary.h
index 3a112d2..606e861 100644
--- a/camel/providers/nntp/camel-nntp-summary.h
+++ b/camel/providers/nntp/camel-nntp-summary.h
@@ -56,5 +56,5 @@ gint camel_nntp_summary_check(CamelNNTPSummary *cns, struct _CamelNNTPStore *sto
G_END_DECLS
-#endif /* ! _CAMEL_NNTP_SUMMARY_H */
+#endif /* _CAMEL_NNTP_SUMMARY_H */
diff --git a/camel/providers/pop3/camel-pop3-engine.c b/camel/providers/pop3/camel-pop3-engine.c
index 0bc1736..6f647df 100644
--- a/camel/providers/pop3/camel-pop3-engine.c
+++ b/camel/providers/pop3/camel-pop3-engine.c
@@ -364,12 +364,12 @@ camel_pop3_engine_iterate(CamelPOP3Engine *pe, CamelPOP3Command *pcwait)
return pe->current==NULL?0:1;
ioerror:
/* we assume all outstanding commands are gunna fail now */
- while ( (pw = (CamelPOP3Command*)camel_dlist_remhead(&pe->active)) ) {
+ while ((pw = (CamelPOP3Command*)camel_dlist_remhead(&pe->active))) {
pw->state = CAMEL_POP3_COMMAND_ERR;
camel_dlist_addtail(&pe->done, (CamelDListNode *)pw);
}
- while ( (pw = (CamelPOP3Command*)camel_dlist_remhead(&pe->queue)) ) {
+ while ((pw = (CamelPOP3Command*)camel_dlist_remhead(&pe->queue))) {
pw->state = CAMEL_POP3_COMMAND_ERR;
camel_dlist_addtail(&pe->done, (CamelDListNode *)pw);
}
diff --git a/camel/providers/pop3/camel-pop3-engine.h b/camel/providers/pop3/camel-pop3-engine.h
index 6377b75..8ebd465 100644
--- a/camel/providers/pop3/camel-pop3-engine.h
+++ b/camel/providers/pop3/camel-pop3-engine.h
@@ -135,4 +135,4 @@ CamelPOP3Command *camel_pop3_engine_command_new (CamelPOP3Engine *pe, guint32 fl
G_END_DECLS
-#endif /* ! _CAMEL_POP3_ENGINE_H */
+#endif /* _CAMEL_POP3_ENGINE_H */
diff --git a/camel/providers/pop3/camel-pop3-stream.h b/camel/providers/pop3/camel-pop3-stream.h
index a019172..52511f9 100644
--- a/camel/providers/pop3/camel-pop3-stream.h
+++ b/camel/providers/pop3/camel-pop3-stream.h
@@ -69,4 +69,4 @@ gint camel_pop3_stream_getd (CamelPOP3Stream *is, guchar **start, guint *len)
G_END_DECLS
-#endif /* ! _CAMEL_POP3_STREAM_H */
+#endif /* _CAMEL_POP3_STREAM_H */
diff --git a/camel/tests/lib/address-data.h b/camel/tests/lib/address-data.h
index 33d27ab..d212fcc 100644
--- a/camel/tests/lib/address-data.h
+++ b/camel/tests/lib/address-data.h
@@ -8,7 +8,7 @@ static struct _a {
gchar *addr;
gchar *utf8; /* the utf8 in this table was generated by camel itself. As a result i'm making the assumption it
was right when it was created. It also depends on the format of ::format(),. which is likely to
- change, to handle other bugs ! */
+ change, to handle other bugs !*/
} test_address[] = {
{ 1, "\"=?ISO-8859-1?Q?David_Guti=E9rrez_Magallanes?=\" <david iiia csic es>", "David Gutiérrez Magallanes <david iiia csic es>" },
{ 1, "\"=?iso-8859-1?Q?Jos=E9?= Antonio Milke G.\" <gerencia ovoplus com>", "José Antonio Milke G. <gerencia ovoplus com>" },
diff --git a/libebackend/e-db3-utils.h b/libebackend/e-db3-utils.h
index ace772b..f61f2e8 100644
--- a/libebackend/e-db3-utils.h
+++ b/libebackend/e-db3-utils.h
@@ -20,5 +20,5 @@ gint e_db3_utils_upgrade_format (const gchar *filename);
G_END_DECLS
-#endif /* ! __E_DB3_UTILS_H__ */
+#endif /* __E_DB3_UTILS_H__ */
diff --git a/libebackend/e-dbhash.h b/libebackend/e-dbhash.h
index ea231bf..5d84bab 100644
--- a/libebackend/e-dbhash.h
+++ b/libebackend/e-dbhash.h
@@ -45,5 +45,5 @@ void e_dbhash_destroy (EDbHash *edbh);
G_END_DECLS
-#endif /* ! __E_DBHASH_H__ */
+#endif /* __E_DBHASH_H__ */
diff --git a/libedataserver/e-iconv.c b/libedataserver/e-iconv.c
index dc5e9ef..b8dcbad 100644
--- a/libedataserver/e-iconv.c
+++ b/libedataserver/e-iconv.c
@@ -253,7 +253,7 @@ locale_parse_lang (const gchar *locale)
}
}
-/* NOTE: Owns the lock on return if keep is TRUE ! */
+/* NOTE: Owns the lock on return if keep is TRUE !*/
static void
e_iconv_init(gint keep)
{
diff --git a/libedataserver/e-iconv.h b/libedataserver/e-iconv.h
index d204836..8c4cbcd 100644
--- a/libedataserver/e-iconv.h
+++ b/libedataserver/e-iconv.h
@@ -47,4 +47,4 @@ G_END_DECLS
#endif /* EDS_DISABLE_DEPRECATED */
-#endif /* !_E_ICONV_H_ */
+#endif /* _E_ICONV_H_ */
diff --git a/libedataserver/e-iterator.h b/libedataserver/e-iterator.h
index 29ba67c..f1ebd54 100644
--- a/libedataserver/e-iterator.h
+++ b/libedataserver/e-iterator.h
@@ -71,4 +71,4 @@ GType e_iterator_get_type (void);
G_END_DECLS
-#endif /* ! __E_ITERATOR_H__ */
+#endif /* __E_ITERATOR_H__ */
diff --git a/libedataserver/e-list-iterator.h b/libedataserver/e-list-iterator.h
index 8b4bf8d..0c57026 100644
--- a/libedataserver/e-list-iterator.h
+++ b/libedataserver/e-list-iterator.h
@@ -46,4 +46,4 @@ GType e_list_iterator_get_type (void);
G_END_DECLS
-#endif /* ! __E_LIST_ITERATOR_H__ */
+#endif /* __E_LIST_ITERATOR_H__ */
diff --git a/libedataserver/e-list.h b/libedataserver/e-list.h
index bded32d..dd3d537 100644
--- a/libedataserver/e-list.h
+++ b/libedataserver/e-list.h
@@ -71,4 +71,4 @@ GType e_list_get_type (void);
G_END_DECLS
-#endif /* ! __E_LIST_H__ */
+#endif /* __E_LIST_H__ */
diff --git a/libedataserver/e-memory.c b/libedataserver/e-memory.c
index c87c008..acbdd10 100644
--- a/libedataserver/e-memory.c
+++ b/libedataserver/e-memory.c
@@ -1114,7 +1114,7 @@ e_poolv_set (EPoolv *poolv, gint index, gchar *str, gint freeit)
poolv->s[index] = e_mempool_strdup(poolv_mempool, str);
g_hash_table_insert(poolv_pool, poolv->s[index], poolv->s[index]);
}
-#endif /* !POOLV_REFCNT */
+#endif /* POOLV_REFCNT */
#ifdef G_THREADS_ENABLED
g_static_mutex_unlock(&poolv_mutex);
diff --git a/libedataserver/e-memory.h b/libedataserver/e-memory.h
index aefe734..b2342c4 100644
--- a/libedataserver/e-memory.h
+++ b/libedataserver/e-memory.h
@@ -77,4 +77,4 @@ void e_poolv_destroy(EPoolv *poolv);
G_END_DECLS
-#endif /* ! _E_MEMORY_H */
+#endif /* _E_MEMORY_H */
diff --git a/libedataserver/e-msgport.c b/libedataserver/e-msgport.c
index 7a2c6ee..868143e 100644
--- a/libedataserver/e-msgport.c
+++ b/libedataserver/e-msgport.c
@@ -831,7 +831,7 @@ void e_thread_destroy(EThread *e)
GList *l;
/* make sure we soak up all the messages first */
- while ( (msg = e_msgport_get(e->server_port)) ) {
+ while ((msg = e_msgport_get(e->server_port))) {
thread_destroy_msg(e, msg);
}
diff --git a/libedataserver/e-proxy.c b/libedataserver/e-proxy.c
index bc88cb7..1c6463f 100644
--- a/libedataserver/e-proxy.c
+++ b/libedataserver/e-proxy.c
@@ -32,7 +32,7 @@
#include <winsock2.h>
#ifndef IN6_ARE_ADDR_EQUAL
#define IN6_ARE_ADDR_EQUAL(a, b) \
- (memcmp ((void*)(a), (void*)(b), sizeof (struct in6_addr)) == 0)
+ (memcmp ((gpointer)(a), (gpointer)(b), sizeof (struct in6_addr)) == 0)
#endif
#else
#include <netinet/in.h>
diff --git a/libedataserver/e-sexp.c b/libedataserver/e-sexp.c
index 6f4b057..4ad7c2c 100644
--- a/libedataserver/e-sexp.c
+++ b/libedataserver/e-sexp.c
@@ -1360,7 +1360,7 @@ e_sexp_encode_string(GString *s, const gchar *string)
else
p = string;
g_string_append(s, " \"");
- while ( (c = *p++) ) {
+ while ((c = *p++)) {
if (c=='\\' || c=='\"' || c=='\'')
g_string_append_c(s, '\\');
g_string_append_c(s, c);
diff --git a/libedataserver/e-source-group.c b/libedataserver/e-source-group.c
index 71917c7..abeef14 100644
--- a/libedataserver/e-source-group.c
+++ b/libedataserver/e-source-group.c
@@ -62,7 +62,7 @@ static void
source_changed_callback (ESource *source,
ESourceGroup *group)
{
- if (! group->priv->ignore_source_changed)
+ if (!group->priv->ignore_source_changed)
g_signal_emit (group, signals[CHANGED], 0);
}
@@ -489,7 +489,7 @@ e_source_group_update_from_xmldoc (ESourceGroup *group,
g_signal_handlers_disconnect_by_func (source, source_changed_callback, group);
}
- if (! changed && q != NULL) {
+ if (!changed && q != NULL) {
if (q->data != p->data)
changed = TRUE;
q = q->next;
diff --git a/libedataserver/e-source-list.c b/libedataserver/e-source-list.c
index 550ce71..5f3a9d3 100644
--- a/libedataserver/e-source-list.c
+++ b/libedataserver/e-source-list.c
@@ -150,7 +150,7 @@ load_from_gconf (ESourceList *list)
g_signal_handlers_disconnect_by_func (group, group_changed_callback, list);
}
- if (! changed && q != NULL) {
+ if (!changed && q != NULL) {
if (q->data != p->data)
changed = TRUE;
q = q->next;
@@ -191,7 +191,7 @@ sync_idle_callback (ESourceList *list)
{
GError *error = NULL;
- if (! e_source_list_sync (list, &error)) {
+ if (!e_source_list_sync (list, &error)) {
g_warning ("Cannot update \"%s\": %s", list->priv->gconf_path, error ? error->message : "Unknown error");
g_error_free (error);
}
@@ -205,7 +205,7 @@ static void
group_changed_callback (ESourceGroup *group,
ESourceList *list)
{
- if (! list->priv->ignore_group_changed)
+ if (!list->priv->ignore_group_changed)
g_signal_emit (list, signals[CHANGED], 0);
if (list->priv->sync_idle_id == 0)
@@ -236,7 +236,7 @@ impl_dispose (GObject *object)
g_source_remove (priv->sync_idle_id);
priv->sync_idle_id = 0;
- if (! e_source_list_sync (E_SOURCE_LIST (object), &error))
+ if (!e_source_list_sync (E_SOURCE_LIST (object), &error))
g_warning ("Could not update \"%s\": %s",
priv->gconf_path, error->message);
}
diff --git a/libedataserver/e-time-utils.c b/libedataserver/e-time-utils.c
index e3b731f..19db08d 100644
--- a/libedataserver/e-time-utils.c
+++ b/libedataserver/e-time-utils.c
@@ -209,7 +209,7 @@ enum ptime_locale_status { not, loc, raw };
# endif /* GCC. */
#endif /* Not __P. */
-#if ! HAVE_LOCALTIME_R && ! defined localtime_r
+#if !HAVE_LOCALTIME_R && !defined localtime_r
# ifdef _LIBC
# define localtime_r __localtime_r
# else
@@ -222,13 +222,13 @@ localtime_r (t, tp)
struct tm *tp;
{
struct tm *l = localtime (t);
- if (! l)
+ if (!l)
return 0;
*tp = *l;
return tp;
}
-# endif /* ! _LIBC */
-#endif /* ! HAVE_LOCALTIME_R && ! defined (localtime_r) */
+# endif /* !_LIBC */
+#endif /* HAVE_LOCALTIME_R && !defined (localtime_r) */
#define match_char(ch1, ch2) if (ch1 != ch2) return NULL
#if defined _LIBC && defined __GNUC__ && __GNUC__ >= 2
@@ -1108,7 +1108,7 @@ __strptime_internal (rp, fmt, tm, decided, era_cnt LOCALE_PARAM)
- (int64_t) era->start_date[0])
* era->absolute_direction));
}
- if (! match)
+ if (!match)
return NULL;
break;
diff --git a/libedataserver/test-source-list.c b/libedataserver/test-source-list.c
index 3192cff..5beccd8 100644
--- a/libedataserver/test-source-list.c
+++ b/libedataserver/test-source-list.c
@@ -524,7 +524,7 @@ on_idle_do_stuff (gpointer unused_data)
if (dump)
dump_list ();
- if (! listen)
+ if (!listen)
g_main_loop_quit (main_loop);
return FALSE;
diff --git a/libedataserverui/e-name-selector-entry.c b/libedataserverui/e-name-selector-entry.c
index 2709739..ca2c2cd 100644
--- a/libedataserverui/e-name-selector-entry.c
+++ b/libedataserverui/e-name-selector-entry.c
@@ -2486,7 +2486,7 @@ populate_popup (ENameSelectorEntry *name_selector_entry, GtkMenu *menu)
show_menu = TRUE;
g_object_set_data (G_OBJECT (menu_item), "order", GINT_TO_POINTER (i));
- if ( i == email_num && len > 1 ) {
+ if (i == email_num && len > 1) {
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), TRUE);
g_signal_connect_swapped (menu_item, "activate", G_CALLBACK (popup_activate_email),
name_selector_entry);
diff --git a/libedataserverui/e-name-selector-list.c b/libedataserverui/e-name-selector-list.c
index 6d0b959..afdc700 100644
--- a/libedataserverui/e-name-selector-list.c
+++ b/libedataserverui/e-name-selector-list.c
@@ -448,7 +448,7 @@ enl_tree_button_press_event (GtkWidget *widget,
show_menu = TRUE;
g_object_set_data (G_OBJECT (menu_item), "order", GINT_TO_POINTER (i));
- if ( i == email_num && len > 1 ) {
+ if (i == email_num && len > 1) {
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), TRUE);
g_signal_connect_swapped (menu_item, "activate", G_CALLBACK (popup_activate_email),
name_selector_entry);
diff --git a/libedataserverui/e-source-selector.c b/libedataserverui/e-source-selector.c
index f19b34b..27a6a79 100644
--- a/libedataserverui/e-source-selector.c
+++ b/libedataserverui/e-source-selector.c
@@ -626,7 +626,7 @@ selection_func (GtkTreeSelection *selection,
if (path_currently_selected)
return TRUE;
- if (! gtk_tree_model_get_iter (model, &iter, path))
+ if (!gtk_tree_model_get_iter (model, &iter, path))
return FALSE;
gtk_tree_model_get (model, &iter, 0, &data, -1);
@@ -680,7 +680,7 @@ cell_toggled_callback (GtkCellRendererToggle *renderer,
ESource *source;
gpointer data;
- if (! gtk_tree_model_get_iter (model, &iter, path)) {
+ if (!gtk_tree_model_get_iter (model, &iter, path)) {
gtk_tree_path_free (path);
return;
}
@@ -1587,14 +1587,14 @@ e_source_selector_peek_primary_selection (ESourceSelector *selector)
}
}
- if (!have_iter && ! gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (selector)), NULL, &iter))
+ if (!have_iter && !gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (selector)), NULL, &iter))
return NULL;
gtk_tree_model_get (model, &iter, 0, &data, -1);
if (!data)
return NULL;
- if (! E_IS_SOURCE (data)) {
+ if (!E_IS_SOURCE (data)) {
g_object_unref (data);
return NULL;
diff --git a/servers/groupwise/e-gw-item.c b/servers/groupwise/e-gw-item.c
index 0951680..09748b1 100644
--- a/servers/groupwise/e-gw-item.c
+++ b/servers/groupwise/e-gw-item.c
@@ -693,7 +693,7 @@ set_recipient_list_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
SoupSoapParameter *temp_param;
recipient->status_enabled = TRUE;
- if ( (temp_param = soup_soap_parameter_get_first_child_by_name (subparam, "deleted")) ) {
+ if ((temp_param = soup_soap_parameter_get_first_child_by_name (subparam, "deleted"))) {
recipient->status = E_GW_ITEM_STAT_DELETED;
value = soup_soap_parameter_get_string_value (temp_param);
formatted_date = e_gw_connection_format_date_string (value);
@@ -701,7 +701,7 @@ set_recipient_list_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
g_free (value), value = NULL;
g_free (formatted_date), formatted_date = NULL;
}
- if ( (temp_param = soup_soap_parameter_get_first_child_by_name (subparam, "declined")) ) {
+ if ((temp_param = soup_soap_parameter_get_first_child_by_name (subparam, "declined"))) {
recipient->status = E_GW_ITEM_STAT_DECLINED;
value = soup_soap_parameter_get_string_value (temp_param);
formatted_date = e_gw_connection_format_date_string (value);
@@ -791,7 +791,7 @@ set_sendoptions_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
priv = item->priv;
- if ( (subparam = soup_soap_parameter_get_first_child_by_name (param, "requestReply")) ) {
+ if ((subparam = soup_soap_parameter_get_first_child_by_name (param, "requestReply"))) {
child = soup_soap_parameter_get_first_child_by_name (subparam, "whenConvenient");
if (child) {
value = soup_soap_parameter_get_string_value (child);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
