From c7ae879700164da8cca08620b8ee8ab745dfb407 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 28 Mar 2000 21:12:12 +0000 Subject: fix warnings svn path=/trunk/; revision=2217 --- camel/camel-exception.c | 2 -- camel/camel-folder.c | 2 +- camel/camel-formatter.c | 4 ++-- camel/camel-marshal-utils.c | 5 ----- camel/camel-medium.c | 2 +- camel/camel-mime-part.c | 10 ++++------ camel/camel-op-queue.c | 2 -- camel/camel-store.c | 1 - camel/camel-stream-b64.c | 1 - camel/camel-stream-fs.c | 1 - camel/data-wrapper-repository.c | 2 +- camel/gmime-utils.c | 3 +++ camel/providers/mbox/camel-mbox-utils.c | 7 +++---- 13 files changed, 15 insertions(+), 27 deletions(-) (limited to 'camel') diff --git a/camel/camel-exception.c b/camel/camel-exception.c index 4102346d96..9a20dd2838 100644 --- a/camel/camel-exception.c +++ b/camel/camel-exception.c @@ -67,8 +67,6 @@ camel_exception_init (CamelException *ex) /* set the Exception Id to NULL */ ex->id = CAMEL_EXCEPTION_NONE; - - return ex; } diff --git a/camel/camel-folder.c b/camel/camel-folder.c index 8abc5d177b..e6ab27b876 100644 --- a/camel/camel-folder.c +++ b/camel/camel-folder.c @@ -1479,7 +1479,7 @@ int camel_folder_search_by_expression (CamelFolder *folder, gboolean camel_folder_search_complete(CamelFolder *folder, int searchid, gboolean wait, CamelException *ex) { g_assert (folder != NULL); - g_return_if_fail (folder->has_search_capability); + g_return_val_if_fail (folder->has_search_capability, FALSE); return CF_CLASS (folder)->search_complete (folder, searchid, wait, ex); } diff --git a/camel/camel-formatter.c b/camel/camel-formatter.c index c7fddbfa1e..bed3f4fc5a 100644 --- a/camel/camel-formatter.c +++ b/camel/camel-formatter.c @@ -763,7 +763,7 @@ handle_image (CamelFormatter *formatter, CamelDataWrapper *wrapper) static void handle_vcard (CamelFormatter *formatter, CamelDataWrapper *wrapper) { - gchar* vcard = NULL; +// gchar* vcard = NULL; debug ("handle_vcard: entered\n"); camel_stream_write_string (formatter->priv->stream, @@ -923,7 +923,7 @@ static void handle_multipart_related (CamelFormatter *formatter, CamelDataWrapper *wrapper) { - CamelMultipart* mp = CAMEL_MULTIPART (wrapper); +// CamelMultipart* mp = CAMEL_MULTIPART (wrapper); debug ("handle_multipart_related: entered\n"); debug ("handle_multipart_related: NYI!!\n"); diff --git a/camel/camel-marshal-utils.c b/camel/camel-marshal-utils.c index 3bb429f6cd..8362256b85 100644 --- a/camel/camel-marshal-utils.c +++ b/camel/camel-marshal-utils.c @@ -68,7 +68,6 @@ _collect_params (GtkArg *params, CamelFuncDef *func_def, va_list var_args) { - GtkArg *last_param; int i; gboolean failed = FALSE; @@ -110,7 +109,6 @@ _collect_params (GtkArg *params, CamelOp * camel_marshal_create_op (CamelFuncDef *func_def, CamelFunc func, ...) { - GtkArg *params; gboolean error; CamelOp *op; va_list args; @@ -191,9 +189,6 @@ camel_op_free (CamelOp *op) void camel_op_run (CamelOp *op) { - GtkArg *params; - gboolean error; - CAMEL_LOG_FULL_DEBUG ("Entering CamelOp::run\n"); g_assert (op); g_assert (op->func_def); diff --git a/camel/camel-medium.c b/camel/camel-medium.c index e96a1aa62c..d87c601b51 100644 --- a/camel/camel-medium.c +++ b/camel/camel-medium.c @@ -132,7 +132,7 @@ _finalize (GtkObject *object) } if (medium->content) - gtk_object_unref(medium->content); + gtk_object_unref (GTK_OBJECT (medium->content)); GTK_OBJECT_CLASS (parent_class)->finalize (object); CAMEL_LOG_FULL_DEBUG ("Leaving CamelMedium::finalize\n"); diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c index 6d6ab55a46..1fb3084ad3 100644 --- a/camel/camel-mime-part.c +++ b/camel/camel-mime-part.c @@ -676,12 +676,10 @@ my_write_content_to_stream (CamelMimePart *mime_part, CamelStream *stream) medium = CAMEL_MEDIUM (mime_part); content = medium->content; - if (!content) { - content = camel_medium_get_content_object (mime_part); - } - if (!content) { - return; + content = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part)); + if (!content) + return; } switch (mime_part->encoding) { @@ -875,7 +873,7 @@ my_set_input_stream (CamelDataWrapper *data_wrapper, CamelStream *stream) printf ("Current position = %d\n", content_stream_inf_bound); if (mime_part->content_input_stream) - gtk_object_unref (mime_part->content_input_stream); + gtk_object_unref (GTK_OBJECT (mime_part->content_input_stream)); mime_part->content_input_stream = camel_seekable_substream_new_with_seekable_stream_and_bounds (seekable_stream, content_stream_inf_bound, -1); diff --git a/camel/camel-op-queue.c b/camel/camel-op-queue.c index 4512ebd93b..284d96c2be 100644 --- a/camel/camel-op-queue.c +++ b/camel/camel-op-queue.c @@ -78,8 +78,6 @@ camel_op_queue_free (CamelOpQueue *op_queue) void camel_op_queue_push_op (CamelOpQueue *queue, CamelOp *op) { - GList *new_op; - CAMEL_LOG_FULL_DEBUG ("Entering CamelOpQueue::push_op\n"); g_assert (queue); g_static_mutex_lock (&op_queue_mutex); diff --git a/camel/camel-store.c b/camel/camel-store.c index 17f29586e4..a8a72c4d25 100644 --- a/camel/camel-store.c +++ b/camel/camel-store.c @@ -33,7 +33,6 @@ static CamelServiceClass *parent_class = NULL; /* Returns the class for a CamelStore */ #define CS_CLASS(so) CAMEL_STORE_CLASS (GTK_OBJECT(so)->klass) -static void _set_separator(CamelStore *store, gchar sep, CamelException *ex); static CamelFolder *_get_root_folder(CamelStore *store, CamelException *ex); static CamelFolder *_get_default_folder(CamelStore *store, CamelException *ex); static CamelFolder *_get_folder (CamelStore *store, const gchar *folder_name, CamelException *ex); diff --git a/camel/camel-stream-b64.c b/camel/camel-stream-b64.c index 1143206077..f7f0eeecfd 100644 --- a/camel/camel-stream-b64.c +++ b/camel/camel-stream-b64.c @@ -419,7 +419,6 @@ my_read_encode (CamelStream *stream, * we are at the end of the input stream * we must pad the output with '='. */ - printf ("%d\n", status->end_state); while ((jend_state != 6)) { if (status->end_state == 5) { diff --git a/camel/camel-stream-fs.c b/camel/camel-stream-fs.c index 3e26abd136..f13e3002c9 100644 --- a/camel/camel-stream-fs.c +++ b/camel/camel-stream-fs.c @@ -386,7 +386,6 @@ _write (CamelStream *stream, const gchar *buffer, gint n) { CamelStreamFs *stream_fs = CAMEL_STREAM_FS (stream); int v; - gint nb_to_write; gint nb_bytes_written = 0; if (n <= 0) diff --git a/camel/data-wrapper-repository.c b/camel/data-wrapper-repository.c index ef698c0d8c..3e646cb71c 100644 --- a/camel/data-wrapper-repository.c +++ b/camel/data-wrapper-repository.c @@ -32,7 +32,7 @@ #include "hash-table-utils.h" static DataWrapperRepository _repository; -static _initialized = -1; +static int _initialized = -1; GMimeContentField *_content_field; diff --git a/camel/gmime-utils.c b/camel/gmime-utils.c index 9dc1bc911b..45c4cff260 100644 --- a/camel/gmime-utils.c +++ b/camel/gmime-utils.c @@ -25,6 +25,7 @@ */ #include +#include #include "gmime-utils.h" #include "string-utils.h" #include "camel-log.h" @@ -119,8 +120,10 @@ gmime_write_header_with_glist_to_stream (CamelStream *stream, static void _store_header_pair_from_string (GArray *header_array, gchar *header_line) { +#if 0 gchar dich_result; gchar *header_name, *header_value; +#endif Rfc822Header header; CAMEL_LOG_FULL_DEBUG ( "_store_header_pair_from_string:: Entering\n"); diff --git a/camel/providers/mbox/camel-mbox-utils.c b/camel/providers/mbox/camel-mbox-utils.c index 52f28b9fa6..f341210f71 100644 --- a/camel/providers/mbox/camel-mbox-utils.c +++ b/camel/providers/mbox/camel-mbox-utils.c @@ -309,7 +309,7 @@ index_message_content(ibex *index, CamelDataWrapper *object) parts = camel_multipart_get_number (CAMEL_MULTIPART(containee)); /*printf("multipart message, scanning contents %d parts ...\n", parts);*/ for (i=0;ifrom, mi->message_position, mi->size);*/ @@ -371,11 +370,11 @@ index_message(ibex *index, int fd, CamelMboxParserMessageInfo *mi) camel_data_wrapper_set_input_stream ( CAMEL_DATA_WRAPPER (message), stream); - index_message_content(index, message); + index_message_content(index, CAMEL_DATA_WRAPPER (message)); /* printf("messageid = '%s'\n", message->message_uid);*/ - gtk_object_unref (message); + gtk_object_unref (GTK_OBJECT (message)); gtk_object_unref (GTK_OBJECT (stream)); lseek(fd, pos, SEEK_SET); -- cgit v1.2.3