summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2013-01-18 12:15:42 +0100
committerMilan Crha <mcrha@redhat.com>2013-01-18 12:16:48 +0100
commit18e0cdff26753531cd90319c86b82e60350c7075 (patch)
treed2b8de72fa261afa9bb6e08a8474078bedce7a37
parent760ac4cc89b4db017de246a53c3edfa43cc13f0d (diff)
downloadevolution-data-server-18e0cdff26753531cd90319c86b82e60350c7075.tar.gz
Bug #691126 - Fix warnings found by Clang
-rw-r--r--calendar/libecal/e-cal.c2
-rw-r--r--calendar/libedata-cal/e-data-cal.c4
-rw-r--r--camel/camel-imapx-server.c2
-rw-r--r--camel/camel-imapx-utils.c1
-rw-r--r--camel/camel-search-sql-sexp.c2
-rw-r--r--camel/providers/nntp/camel-nntp-store.c2
6 files changed, 6 insertions, 7 deletions
diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index 810f3eab8..3c43bed8b 100644
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -241,7 +241,7 @@ get_status_from_error (const GError *error)
#undef err
if G_LIKELY (error == NULL)
- return Success;
+ return E_CALENDAR_STATUS_OK;
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_DBUS_ERROR)) {
gchar *name;
diff --git a/calendar/libedata-cal/e-data-cal.c b/calendar/libedata-cal/e-data-cal.c
index 7ffc40e47..d2f3bcf73 100644
--- a/calendar/libedata-cal/e-data-cal.c
+++ b/calendar/libedata-cal/e-data-cal.c
@@ -121,12 +121,12 @@ typedef struct {
/* OP_MODIFY_OBJECTS */
struct _mo {
GSList *calobjs;
- EDataCalObjModType mod;
+ CalObjModType mod; /* corresponds to EDataCalObjModType */
} mo;
/* OP_REMOVE_OBJECTS */
struct _ro {
GSList *ids;
- EDataCalObjModType mod;
+ CalObjModType mod; /* corresponds to EDataCalObjModType */
} ro;
/* OP_GET_TIMEZONE */
gchar *tzid;
diff --git a/camel/camel-imapx-server.c b/camel/camel-imapx-server.c
index d414db4e6..75b73f61a 100644
--- a/camel/camel-imapx-server.c
+++ b/camel/camel-imapx-server.c
@@ -5618,7 +5618,7 @@ imapx_command_delete_folder_done (CamelIMAPXServer *is,
GError **error)
{
CamelIMAPXJob *job;
- gboolean success;
+ gboolean success = TRUE;
job = camel_imapx_command_get_job (ic);
g_return_val_if_fail (CAMEL_IS_IMAPX_JOB (job), FALSE);
diff --git a/camel/camel-imapx-utils.c b/camel/camel-imapx-utils.c
index e3ed5703a..b5601bdb2 100644
--- a/camel/camel-imapx-utils.c
+++ b/camel/camel-imapx-utils.c
@@ -132,7 +132,6 @@ imapx_parse_flags (CamelIMAPXStream *stream,
}
found:
- tok = tok; /* fixes stupid warning */
g_free (upper);
} else if (tok != ')') {
g_set_error (error, CAMEL_IMAPX_ERROR, 1, "expecting flag");
diff --git a/camel/camel-search-sql-sexp.c b/camel/camel-search-sql-sexp.c
index 356c78ee0..4007e48f0 100644
--- a/camel/camel-search-sql-sexp.c
+++ b/camel/camel-search-sql-sexp.c
@@ -715,7 +715,7 @@ camel_sexp_to_sql_sexp (const gchar *sql)
CamelSExp *sexp;
CamelSExpResult *r;
gint i;
- gchar *res;
+ gchar *res = NULL;
sexp = camel_sexp_new ();
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index ebdc1b44d..966d9525c 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -1551,7 +1551,7 @@ camel_nntp_raw_commandv (CamelNNTPStore *store,
stream = CAMEL_STREAM (store->mem);
while ((c = *p++)) {
- gchar *strval;
+ gchar *strval = NULL;
switch (c) {
case '%':