From 96be0c50f7dde84249db1194e69e8b146afc0687 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Tue, 23 Jan 2001 03:25:03 +0000 Subject: Removed some debug 'warnings', as they should now be displayed at the 2001-01-23 Not Zed * providers/imap/camel-imap-summary.c (message_info_load): Removed some debug 'warnings', as they should now be displayed at the toplevel loader, and just made the code match similar code elsewhere. * providers/local/camel-mbox-summary.c (message_info_load): Error handling. (message_info_save): more error handling. * camel-folder-summary.c (message_info_load): Add error handling and sanity checking. (camel_folder_summary_load): Add error checks. (perform_content_info_load): Error + sanity checks. (content_info_load): error + sanity checks. svn path=/trunk/; revision=7737 --- camel/providers/imap/camel-imap-summary.c | 17 +++++++---------- camel/providers/local/camel-mbox-summary.c | 14 ++++++++++---- 2 files changed, 17 insertions(+), 14 deletions(-) (limited to 'camel/providers') diff --git a/camel/providers/imap/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c index 74a024f760..66228649bc 100644 --- a/camel/providers/imap/camel-imap-summary.c +++ b/camel/providers/imap/camel-imap-summary.c @@ -169,20 +169,17 @@ message_info_load (CamelFolderSummary *s, FILE *in) CamelImapMessageInfo *iinfo; info = camel_imap_summary_parent->message_info_load (s, in); - if (!info) { - g_warning ("eek! encountered a NULL message info!"); - return NULL; - } - iinfo = (CamelImapMessageInfo *)info; + if (info) { + iinfo = (CamelImapMessageInfo *)info; - if (camel_folder_summary_decode_uint32 (in, &iinfo->server_flags) == -1) { - /* wouldn't it just be better to default to certain server flags here? */ - g_warning ("eek! problems decoding server flags!"); - camel_folder_summary_info_free (s, info); - return NULL; + if (camel_folder_summary_decode_uint32 (in, &iinfo->server_flags) == -1) + goto error; } return info; +error: + camel_folder_summary_info_free (s, info); + return NULL; } static int diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c index 5b62743857..ab42e10df7 100644 --- a/camel/providers/local/camel-mbox-summary.c +++ b/camel/providers/local/camel-mbox-summary.c @@ -197,11 +197,15 @@ message_info_load(CamelFolderSummary *s, FILE *in) mi = ((CamelFolderSummaryClass *)camel_mbox_summary_parent)->message_info_load(s, in); if (mi) { CamelMboxMessageInfo *mbi = (CamelMboxMessageInfo *)mi; - - camel_folder_summary_decode_off_t(in, &mbi->frompos); + + if (camel_folder_summary_decode_off_t(in, &mbi->frompos) == -1) + goto error; } return mi; +error: + camel_folder_summary_info_free(s, mi); + return NULL; } static int @@ -211,9 +215,11 @@ message_info_save(CamelFolderSummary *s, FILE *out, CamelMessageInfo *mi) io(printf("saving mbox message info\n")); - ((CamelFolderSummaryClass *)camel_mbox_summary_parent)->message_info_save(s, out, mi); + if (((CamelFolderSummaryClass *)camel_mbox_summary_parent)->message_info_save(s, out, mi) == -1 + || camel_folder_summary_encode_off_t(out, mbi->frompos) == -1) + return -1; - return camel_folder_summary_encode_off_t(out, mbi->frompos); + return 0; } static int -- cgit v1.2.3