diff options
| author | Laurent Aguerreche <laguerre@src.gnome.org> | 2007-08-14 21:30:59 +0000 |
|---|---|---|
| committer | Laurent Aguerreche <laguerre@src.gnome.org> | 2007-08-14 21:30:59 +0000 |
| commit | 3632b59a1a3aafc92ca9a06c6df04b2e329465cd (patch) | |
| tree | c9902431a1699fe35303cfa231c4fdf08fc0bb31 | |
| parent | 644d1aca559823232a4e5f680abb70775f750c9b (diff) | |
| download | tracker-3632b59a1a3aafc92ca9a06c6df04b2e329465cd.tar.gz | |
Remove g_return_val_if_fail(mf,NULL) in email_parse_mail_message_by_path() to avoid print of warnings when file
to open does not exist. That can happen quite frequently due to storage of IMAP e-mails so it not an
error/warning.
svn path=/trunk/; revision=779
| -rw-r--r-- | src/trackerd/tracker-email-utils.c | 4 | ||||
| -rw-r--r-- | src/trackerd/tracker-stemmer.c | 10 | ||||
| -rw-r--r-- | src/trackerd/tracker-stemmer.h | 5 |
3 files changed, 8 insertions, 11 deletions
diff --git a/src/trackerd/tracker-email-utils.c b/src/trackerd/tracker-email-utils.c index 69c9e5462..69f5f8e72 100644 --- a/src/trackerd/tracker-email-utils.c +++ b/src/trackerd/tracker-email-utils.c @@ -535,7 +535,9 @@ email_parse_mail_message_by_path (MailApplication mail_app, const char *path, Lo g_return_val_if_fail (path, NULL); mf = email_open_mail_file_at_offset (mail_app, path, 0, FALSE); - g_return_val_if_fail (mf, NULL); + if (!mf) { + return NULL; + } mail_msg = email_mail_file_parse_next (mf, load_helper); diff --git a/src/trackerd/tracker-stemmer.c b/src/trackerd/tracker-stemmer.c index 241d39a76..9a19d52c9 100644 --- a/src/trackerd/tracker-stemmer.c +++ b/src/trackerd/tracker-stemmer.c @@ -26,16 +26,14 @@ extern Tracker *tracker; -char * -tracker_stem (const char *word, int word_length) +gchar * +tracker_stem (const gchar *word, gint word_length) { - char *stem_word; + gchar *stem_word; g_mutex_lock (tracker->stemmer_mutex); - stem_word = (char *) sb_stemmer_stem (tracker->stemmer, (unsigned char*) word, word_length); + stem_word = (gchar *) sb_stemmer_stem (tracker->stemmer, (guchar *) word, word_length); g_mutex_unlock (tracker->stemmer_mutex); return g_strdup (stem_word); } - - diff --git a/src/trackerd/tracker-stemmer.h b/src/trackerd/tracker-stemmer.h index f317c8c5a..b7cee6e19 100644 --- a/src/trackerd/tracker-stemmer.h +++ b/src/trackerd/tracker-stemmer.h @@ -17,12 +17,9 @@ * Boston, MA 02110-1301, USA. */ - - #ifndef _TRACKER_STEMMER_H_ #define _TRACKER_STEMMER_H_ -char * tracker_stem (const char *word, int word_length); - +gchar * tracker_stem (const gchar *word, gint word_length); #endif |