From c8de5a00598fe7c49a76eb949aceeb7b05389978 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Fri, 16 May 2003 18:47:59 +0000 Subject: Ensure cmdbuf is initialized to avoid compiler warning. 2003-05-16 Jeremy Katz * providers/smtp/camel-smtp-transport.c (smtp_helo): Ensure cmdbuf is initialized to avoid compiler warning. * providers/local/camel-mbox-summary.c (summary_header_load): Cast folder_size to uint32 to fix warning. (camel_mbox_summary_sync_mbox): Update for new API. * providers/imap/camel-imap-utils.c (parse_params): imap_parse_nstring expects size_t, not int (imap_body_decode): Likewise. * camel-stream-filter.c (do_read): presize needs to be size_t instead of int. (do_write): Likewise. * camel-seekable-substream.c (stream_read): Return ssize_t instead of int to match prototypes. (stream_write): Likewise. * camel-mime-part.c (construct_from_parser): len needs to be size_t instead of int. * camel-mime-parser.c (folder_scan_step): datalength needs to be a size_t* instead of an int* to make dependent APIs safe. (camel_mime_parser_step): Likewise. (folder_scan_content): Likewise. * camel-mime-parser.h: Likewise. * camel-mime-message.c (camel_mime_message_class_init): Use glib macro for pointer/int conversions. (construct_from_parser): Update for new API. * camel-folder-summary.c (camel_folder_summary_info_new_from_parser): Update len to be size_t for new API. (summary_build_content_info): Likewise. * camel-http-stream.c (http_get_headers): Likewise. * camel-mime-part-utils.c (simple_data_wrapper_construct_from_parser): Likewise. * camel-multipart-signed.c (signed_construct_from_parser): Likewise. * camel-multipart.c (construct_from_parser): Likewise. * camel-folder-search.c (match_words_index): Use glib macros for pointer/int conversions. * camel-html-parser.c (tokenise_setup): Likewise. (convert_entity): Likewise. * camel-block-file.c (block_hash_func): Likewise. (camel_block_file_get_block): Likewise. (camel_block_file_get_block): Likewise. (camel_block_file_detach_block): Likewise. * camel-session.c (session_thread_msg_new): Likewise. (session_thread_msg_free): Likewise. (session_thread_wait): Likewise. * camel-text-index.c (text_index_compress_nosync): Likewise. (text_index_compress_nosync): Likewise. (camel_text_index_validate): Likewise. * camel-vee-folder.c (vee_folder_remove_folder): Likewise. (unmatched_check_uid): Likewise. (folder_added_uid): Likewise. (vee_folder_build_folder): Likewise. (folder_changed_add_uid): Likewise. (folder_changed_remove_uid): Likewise. * providers/imap/camel-imap-search.c (imap_body_contains): Likewise. * providers/pop3/camel-pop3-folder.c (cmd_list): Likewise. (cmd_uidl): Likewise. * camel-data-cache.c (data_cache_init): Cast to CamelCopyFunc. Fixes a warning. svn path=/trunk/; revision=21220 --- camel/providers/imap/camel-imap-search.c | 4 ++-- camel/providers/imap/camel-imap-utils.c | 4 ++-- camel/providers/local/camel-mbox-summary.c | 4 ++-- camel/providers/pop3/camel-pop3-folder.c | 4 ++-- camel/providers/smtp/camel-smtp-transport.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'camel/providers') diff --git a/camel/providers/imap/camel-imap-search.c b/camel/providers/imap/camel-imap-search.c index 0c8816e10c..8f65def872 100644 --- a/camel/providers/imap/camel-imap-search.c +++ b/camel/providers/imap/camel-imap-search.c @@ -480,13 +480,13 @@ imap_body_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, Came info = s->summary->pdata[i]; uid = (char *)camel_message_info_uid(info); uidn = strtoul(uid, NULL, 10); - g_hash_table_insert(uid_hash, (void *)uidn, uid); + g_hash_table_insert(uid_hash, GUINT_TO_POINTER(uidn), uid); } uidp = (guint32 *)mr->matches->data; j = mr->matches->len; for (i=0;isummary_header_load(s, in) == -1) return -1; - return camel_file_util_decode_uint32(in, &mbs->folder_size); + return camel_file_util_decode_uint32(in, (guint32 *) &mbs->folder_size); } static int @@ -796,7 +796,7 @@ camel_mbox_summary_sync_mbox(CamelMboxSummary *cls, guint32 flags, CamelFolderCh int i, count; CamelMboxMessageInfo *info = NULL; char *buffer, *xevnew = NULL; - int len; + size_t len; const char *fromline; int lastdel = FALSE; #ifdef STATUS_PINE diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c index 1aef811e23..50584d228e 100644 --- a/camel/providers/pop3/camel-pop3-folder.c +++ b/camel/providers/pop3/camel-pop3-folder.c @@ -199,7 +199,7 @@ cmd_list(CamelPOP3Engine *pe, CamelPOP3Stream *stream, void *data) if ((pop3_store->engine->capa & CAMEL_POP3_CAP_UIDL) == 0) fi->cmd = camel_pop3_engine_command_new(pe, CAMEL_POP3_COMMAND_MULTI, cmd_builduid, fi, "TOP %u 0\r\n", id); g_ptr_array_add(((CamelPOP3Folder *)folder)->uids, fi); - g_hash_table_insert(((CamelPOP3Folder *)folder)->uids_id, (void *)id, fi); + g_hash_table_insert(((CamelPOP3Folder *)folder)->uids_id, GINT_TO_POINTER(id), fi); } } } while (ret>0); @@ -222,7 +222,7 @@ cmd_uidl(CamelPOP3Engine *pe, CamelPOP3Stream *stream, void *data) if (strlen(line) > 1024) line[1024] = 0; if (sscanf(line, "%u %s", &id, uid) == 2) { - fi = g_hash_table_lookup(folder->uids_id, (void *)id); + fi = g_hash_table_lookup(folder->uids_id, GINT_TO_POINTER(id)); if (fi) { camel_operation_progress(NULL, (fi->index+1) * 100 / folder->uids->len); fi->uid = g_strdup(uid); diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c index 84948f91eb..c5947dc0ad 100644 --- a/camel/providers/smtp/camel-smtp-transport.c +++ b/camel/providers/smtp/camel-smtp-transport.c @@ -859,7 +859,7 @@ static gboolean smtp_helo (CamelSmtpTransport *transport, CamelException *ex) { /* say hello to the server */ - char *name, *cmdbuf, *respbuf = NULL; + char *name = NULL, *cmdbuf = NULL, *respbuf = NULL; struct hostent *host; CamelException err; const char *token; -- cgit v1.2.3