[evolution-kolab/gnome-2-30] backend, utils, camel: ISO C90 forbids mixed declarations and code
- From: Christian Hilberg <chilberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab/gnome-2-30] backend, utils, camel: ISO C90 forbids mixed declarations and code
- Date: Wed, 16 Nov 2011 19:19:07 +0000 (UTC)
commit 33e9241d53f25e2f3224d781481330e169891004
Author: Christian Hilberg <hilberg kernelconcepts de>
Date: Wed Nov 16 20:15:09 2011 +0100
backend, utils, camel: ISO C90 forbids mixed declarations and code
* fixed a few occasions of mixed declarations and code
src/calendar/e-cal-backend-kolab.c | 3 ++-
src/camel/camel-kolab-imapx-metadata-db.c | 4 ++--
src/libekolabutil/kolab-util-http.c | 4 ++--
src/libekolabutil/kolab-util-sqlite.c | 4 ++--
4 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/src/calendar/e-cal-backend-kolab.c b/src/calendar/e-cal-backend-kolab.c
index 82db17d..f38db59 100644
--- a/src/calendar/e-cal-backend-kolab.c
+++ b/src/calendar/e-cal-backend-kolab.c
@@ -1205,10 +1205,11 @@ e_cal_backend_kolab_get_free_busy (ECalBackendSync *backend,
GList *it;
GError *error = NULL;
gboolean internal_state = TRUE;
+ KolabSettingsHandler *ksettings = NULL;
+
(void) cal;
(void) start;
(void) end;
- KolabSettingsHandler *ksettings = NULL;
ksettings = kolab_mail_access_get_settings_handler (priv->cal_koma);
if (ksettings == NULL)
diff --git a/src/camel/camel-kolab-imapx-metadata-db.c b/src/camel/camel-kolab-imapx-metadata-db.c
index 4c4b564..849417f 100644
--- a/src/camel/camel-kolab-imapx-metadata-db.c
+++ b/src/camel/camel-kolab-imapx-metadata-db.c
@@ -100,12 +100,12 @@ kolab_db_open_trycreate (const gchar* path)
static gint
kolab_db_table_exists_cb (void *data, gint ncols, gchar **coltext, gchar **colname)
{
+ CamelKolabIMAPXMetaDataDB *mdb = (CamelKolabIMAPXMetaDataDB *)data;
+
(void)ncols;
(void)coltext;
(void)colname;
- CamelKolabIMAPXMetaDataDB *mdb = (CamelKolabIMAPXMetaDataDB *)data;
-
mdb->ctr++;
return SQLITE_OK;
diff --git a/src/libekolabutil/kolab-util-http.c b/src/libekolabutil/kolab-util-http.c
index cc8ef3ee..82b58bb 100644
--- a/src/libekolabutil/kolab-util-http.c
+++ b/src/libekolabutil/kolab-util-http.c
@@ -133,10 +133,10 @@ kolab_util_http_soup_get (const KolabHttpJob *job, GError **error)
gssize nbytes = -1;
gchar *url_string = NULL;
- g_return_val_if_fail (error == NULL || *error == NULL, -1);
-
static gulong kolab_soup_auth_handler_id = 0; /* TODO is 0 an invalid id? */
+ g_return_val_if_fail (error == NULL || *error == NULL, -1);
+
/* connect the "authenticate" signal handler,
* disconnect a previously connected one.
* TODO: check whether we need to disconnect-connect
diff --git a/src/libekolabutil/kolab-util-sqlite.c b/src/libekolabutil/kolab-util-sqlite.c
index 290cdd3..cb2215e 100644
--- a/src/libekolabutil/kolab-util-sqlite.c
+++ b/src/libekolabutil/kolab-util-sqlite.c
@@ -39,12 +39,12 @@ kolab_util_sqlite_table_exists_cb (void *data,
gchar **coltext,
gchar **colname)
{
+ KolabUtilSqliteDb *kdb = (KolabUtilSqliteDb *)data;
+
(void)ncols;
(void)coltext;
(void)colname;
- KolabUtilSqliteDb *kdb = (KolabUtilSqliteDb *)data;
-
kdb->ctr++;
return SQLITE_OK;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]