aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/camel-folder-summary.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 30aee963a3..7305a450a3 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-08 Not Zed <NotZed@Ximian.com>
+
+ * camel-folder-summary.c (camel_folder_summary_load): use
+ g_strerror, and use errno directly rather than ferrno().
+ (summary_header_load): set errno when we get a version mismatch.
+
2003-04-07 Jeffrey Stedfast <fejj@ximian.com>
* camel-gpg-context.c: Disable debug printf's
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index a66026f0ab..1552a08ced 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -589,7 +589,7 @@ camel_folder_summary_load(CamelFolderSummary *s)
return 0;
error:
- g_warning ("Cannot load summary file: %s", strerror (ferror (in)));
+ g_warning ("Cannot load summary file: `%s': %s", s->summary_path, g_strerror (errno));
CAMEL_SUMMARY_UNLOCK(s, io_lock);
fclose (in);
s->flags |= ~CAMEL_SUMMARY_DIRTY;
@@ -1388,6 +1388,7 @@ summary_header_load(CamelFolderSummary *s, FILE *in)
s->saved_count = count;
if (s->version != version) {
g_warning("Summary header version mismatch");
+ errno = EINVAL;
return -1;
}
return 0;