From 7aea532838f316d5e73a05d1e34821f99a6e881d Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Mon, 9 May 2011 09:20:27 +0300 Subject: [PATCH] * fix some small issues --- src/mu-msg-fields.c | 2 +- src/mu-msg-file.c | 11 +++++------ src/mu-msg.c | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/mu-msg-fields.c b/src/mu-msg-fields.c index d0573674..714d57eb 100644 --- a/src/mu-msg-fields.c +++ b/src/mu-msg-fields.c @@ -228,7 +228,7 @@ mu_msg_field_id_from_name (const char* str, gboolean err) g_return_val_if_fail (str, MU_MSG_FIELD_ID_NONE); for (i = 0; i != G_N_ELEMENTS(FIELD_DATA); ++i) - if (strcmp(str, FIELD_DATA[i]._name) == 0) + if (g_strcmp0(str, FIELD_DATA[i]._name) == 0) return FIELD_DATA[i]._id; if (err) diff --git a/src/mu-msg-file.c b/src/mu-msg-file.c index 4847974e..ab4614d7 100644 --- a/src/mu-msg-file.c +++ b/src/mu-msg-file.c @@ -33,11 +33,10 @@ #include "mu-maildir.h" #include "mu-msg-priv.h" -static gboolean init_file_metadata (MuMsgFile *self, const char* path, const char *mdir, - GError **err); +static gboolean init_file_metadata (MuMsgFile *self, const char* path, + const char *mdir, GError **err); static gboolean init_mime_msg (MuMsgFile *msg, GError **err); - #define CACHE(MFID) (self->_str_cache[(MFID)]) #define SET_CACHE(MFID,V)(self->_str_cache[(MFID)]=(V)) @@ -50,6 +49,9 @@ mu_msg_file_new (const char* filepath, const char *mdir, GError **err) g_return_val_if_fail (filepath, NULL); self = g_slice_new0 (MuMsgFile); + for (i = 0; i != MU_MSG_FIELD_ID_NUM; ++i) + SET_CACHE(i,NULL); + if (!init_file_metadata (self, filepath, mdir, err)) { mu_msg_file_destroy (self); return NULL; @@ -59,9 +61,6 @@ mu_msg_file_new (const char* filepath, const char *mdir, GError **err) mu_msg_file_destroy (self); return NULL; } - - for (i = 0; i != MU_MSG_FIELD_ID_NUM; ++i) - SET_CACHE(i,NULL); return self; } diff --git a/src/mu-msg.c b/src/mu-msg.c index e0327b8f..af1c7d8c 100644 --- a/src/mu-msg.c +++ b/src/mu-msg.c @@ -125,7 +125,7 @@ mu_msg_get_path (MuMsg *self) { g_return_val_if_fail (self, NULL); return mu_msg_file_get_str_field (self->_file, - MU_MSG_FIELD_ID_PATH); + MU_MSG_FIELD_ID_PATH); } @@ -134,7 +134,7 @@ mu_msg_get_subject (MuMsg *self) { g_return_val_if_fail (self, NULL); return mu_msg_file_get_str_field (self->_file, - MU_MSG_FIELD_ID_SUBJECT); + MU_MSG_FIELD_ID_SUBJECT); } const char* @@ -142,7 +142,7 @@ mu_msg_get_msgid (MuMsg *self) { g_return_val_if_fail (self, NULL); return mu_msg_file_get_str_field (self->_file, - MU_MSG_FIELD_ID_MSGID); + MU_MSG_FIELD_ID_MSGID); } const char* @@ -150,7 +150,7 @@ mu_msg_get_maildir (MuMsg *self) { g_return_val_if_fail (self, NULL); return mu_msg_file_get_str_field (self->_file, - MU_MSG_FIELD_ID_MAILDIR); + MU_MSG_FIELD_ID_MAILDIR); } @@ -159,7 +159,7 @@ mu_msg_get_from (MuMsg *self) { g_return_val_if_fail (self, NULL); return mu_msg_file_get_str_field (self->_file, - MU_MSG_FIELD_ID_FROM); + MU_MSG_FIELD_ID_FROM); } @@ -168,7 +168,7 @@ mu_msg_get_to (MuMsg *self) { g_return_val_if_fail (self, NULL); return mu_msg_file_get_str_field (self->_file, - MU_MSG_FIELD_ID_TO); + MU_MSG_FIELD_ID_TO); } const char* @@ -176,7 +176,7 @@ mu_msg_get_cc (MuMsg *self) { g_return_val_if_fail (self, NULL); return mu_msg_file_get_str_field (self->_file, - MU_MSG_FIELD_ID_CC); + MU_MSG_FIELD_ID_CC); } @@ -185,7 +185,7 @@ mu_msg_get_bcc (MuMsg *self) { g_return_val_if_fail (self, NULL); return mu_msg_file_get_str_field (self->_file, - MU_MSG_FIELD_ID_BCC); + MU_MSG_FIELD_ID_BCC); } @@ -194,7 +194,7 @@ mu_msg_get_date (MuMsg *self) { g_return_val_if_fail (self, (time_t)-1); return (time_t)mu_msg_file_get_num_field (self->_file, - MU_MSG_FIELD_ID_DATE); + MU_MSG_FIELD_ID_DATE); } @@ -204,7 +204,7 @@ mu_msg_get_flags (MuMsg *self) { g_return_val_if_fail (self, MU_MSG_FLAG_NONE); return (MuMsgFlags)mu_msg_file_get_num_field (self->_file, - MU_MSG_FIELD_ID_FLAGS); + MU_MSG_FIELD_ID_FLAGS); } size_t @@ -212,7 +212,7 @@ mu_msg_get_size (MuMsg *self) { g_return_val_if_fail (self, 0); return (size_t)mu_msg_file_get_num_field (self->_file, - MU_MSG_FIELD_ID_SIZE); + MU_MSG_FIELD_ID_SIZE); } @@ -221,7 +221,7 @@ mu_msg_get_prio (MuMsg *self) { g_return_val_if_fail (self, (time_t)-1); return (MuMsgPrio)mu_msg_file_get_num_field (self->_file, - MU_MSG_FIELD_ID_PRIO); + MU_MSG_FIELD_ID_PRIO); }