* improvement of modest_utils_utf8_strcmp; and optimize

[modest] / src / modest-text-utils.c

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 7d2806e..2ea9684 100644 (file)
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -42,7 +42,7 @@
 #include <modest-tny-platform-factory.h>
 #include <modest-text-utils.h>
 #include <modest-runtime.h>
-
+#include <ctype.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -1079,59 +1079,65 @@ modest_text_utils_get_subject_prefix_len (const gchar *sub)
 gint
 modest_text_utils_utf8_strcmp (const gchar* s1, const gchar *s2, gboolean insensitive)
 {
-       gint result = 0;
-       gchar *n1, *n2;
 
-       /* work even when s1 and/or s2 == NULL */
+/* work even when s1 and/or s2 == NULL */
        if (G_UNLIKELY(s1 == s2))
                return 0;
-
-       /* if it's not case sensitive */
-       if (!insensitive)
-               return strcmp (s1 ? s1 : "", s2 ? s2 : "");
+       if (G_UNLIKELY(!s1))
+               return -1;
+       if (G_UNLIKELY(!s2))
+               return 1;
        
-       n1 = g_utf8_collate_key (s1 ? s1 : "", -1);
-       n2 = g_utf8_collate_key (s2 ? s2 : "", -1);
-       
-       result = strcmp (n1, n2);
+       /* if it's not case sensitive */
+       if (!insensitive) {
 
-       g_free (n1);
-       g_free (n2);
+               /* optimization: short cut if first char is ascii */ 
+               if (((s1[0] & 0xf0)== 0) && ((s2[0] & 0xf0) == 0)) 
+                       return s1[0] - s2[0];
+               
+               return g_utf8_collate (s1, s2);
+
+       } else {
+               gint result;
+               gchar *n1, *n2;
+
+               /* optimization: short cut iif first char is ascii */ 
+               if (((s1[0] & 0xf0) == 0) && ((s2[0] & 0xf0) == 0)) 
+                       return tolower(s1[0]) - tolower(s2[0]);
+               
+               n1 = g_utf8_strdown (s1, -1);
+               n2 = g_utf8_strdown (s2, -1);
+               
+               result = g_utf8_collate (n1, n2);
+               
+               g_free (n1);
+               g_free (n2);
        
-       return result;
+               return result;
+       }
 }
 
 
 const gchar*
 modest_text_utils_get_display_date (time_t date)
 {
-       time_t now;
 #define DATE_BUF_SIZE 64 
-       static const guint ONE_DAY = 24 * 60 * 60; /* seconds in one day */
        static gchar date_buf[DATE_BUF_SIZE];
+       
+       /* calculate the # of days since epoch for 
+        * for today and for the date provided 
+        * based on idea from pvanhoof */
+       int day      = time(NULL) / (24 * 60 * 60);
+       int date_day = date       / (24 * 60 * 60);
 
-       gchar today_buf [DATE_BUF_SIZE];  
-
-       modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, "%x", date); 
-
-       now = time (NULL);
+       /* if it's today, show the time, if it's not today, show the date instead */
 
-       /* we check if the date is within the last 24h, if not, we don't
-        * have to do the extra, expensive strftime, which was very visible
-        * in the profiles.
-        */
-       if (abs(now - date) < ONE_DAY) {
-               
-               /* it's within the last 24 hours, but double check */
-               /* use the localized dates */
-               modest_text_utils_strftime (today_buf,  DATE_BUF_SIZE, "%x", now); 
+       if (day == date_day) /* is the date today? */
+               modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, "%X", date);
+       else 
+               modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, "%x", date); 
 
-               /* if it's today, use the time instead */
-               if (strcmp (date_buf, today_buf) == 0)
-                       modest_text_utils_strftime (date_buf, DATE_BUF_SIZE, "%X", date);
-       }
-       
-       return date_buf;
+       return date_buf; /* this is a static buffer, don't free! */
 }