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/camel-mime-parser.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'camel/camel-mime-parser.c') diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c index a9f7704cca..511aa121ca 100644 --- a/camel/camel-mime-parser.c +++ b/camel/camel-mime-parser.c @@ -275,13 +275,13 @@ struct _header_scan_filter { CamelMimeFilter *filter; }; -static void folder_scan_step(struct _header_scan_state *s, char **databuffer, int *datalength); +static void folder_scan_step(struct _header_scan_state *s, char **databuffer, size_t *datalength); static void folder_scan_drop_step(struct _header_scan_state *s); static int folder_scan_init_with_fd(struct _header_scan_state *s, int fd); static int folder_scan_init_with_stream(struct _header_scan_state *s, CamelStream *stream); static struct _header_scan_state *folder_scan_init(void); static void folder_scan_close(struct _header_scan_state *s); -static struct _header_scan_stack *folder_scan_content(struct _header_scan_state *s, int *lastone, char **data, int *length); +static struct _header_scan_stack *folder_scan_content(struct _header_scan_state *s, int *lastone, char **data, size_t *length); static struct _header_scan_stack *folder_scan_header(struct _header_scan_state *s, int *lastone); static int folder_scan_skip_line(struct _header_scan_state *s, GByteArray *save); static off_t folder_seek(struct _header_scan_state *s, off_t offset, int whence); @@ -728,7 +728,7 @@ void camel_mime_parser_drop_step(CamelMimeParser *m) * is returned. **/ enum _header_state -camel_mime_parser_step(CamelMimeParser *m, char **databuffer, int *datalength) +camel_mime_parser_step(CamelMimeParser *m, char **databuffer, size_t *datalength) { struct _header_scan_state *s = _PRIVATE(m); @@ -736,7 +736,7 @@ camel_mime_parser_step(CamelMimeParser *m, char **databuffer, int *datalength) if (s->unstep <= 0) { char *dummy; - int dummylength; + size_t dummylength; if (databuffer == NULL) { databuffer = &dummy; @@ -1358,7 +1358,7 @@ header_done: } static struct _header_scan_stack * -folder_scan_content(struct _header_scan_state *s, int *lastone, char **data, int *length) +folder_scan_content(struct _header_scan_state *s, int *lastone, char **data, size_t *length) { int atleast = s->atleast, newatleast; register char *inptr; @@ -1570,7 +1570,7 @@ folder_scan_init_with_stream(struct _header_scan_state *s, CamelStream *stream) #define USE_FROM static void -folder_scan_step(struct _header_scan_state *s, char **databuffer, int *datalength) +folder_scan_step(struct _header_scan_state *s, char **databuffer, size_t *datalength) { struct _header_scan_stack *h, *hb; const char *content; @@ -1853,7 +1853,7 @@ int main(int argc, char **argv) int fd; struct _header_scan_state *s; char *data; - int len; + size_t len; int state; char *name = "/tmp/evmail/Inbox"; struct _header_scan_stack *h; -- cgit