[devhelp/wip/swilmet/misc-improvements] keyword-model: improve the globbed_keywords functions

[Sébastien Wilmet <swilmet src gnome org>]

commit 5a89464629d708b01b5c2da06787bd82d9eba8c9
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sun May 31 08:50:08 2015 +0200

    keyword-model: improve the globbed_keywords functions
    
    - Avoid another O(n^2) loop
    - Make the code a bit clearer (space out more the code, improve some
    comments, etc).

 src/dh-keyword-model.c |   49 ++++++++++++++++++++++++++++-------------------
 1 files changed, 29 insertions(+), 20 deletions(-)
---
diff --git a/src/dh-keyword-model.c b/src/dh-keyword-model.c
index 1e481ff..3df2ebf 100644
--- a/src/dh-keyword-model.c
+++ b/src/dh-keyword-model.c
@@ -361,61 +361,70 @@ dh_keyword_model_set_words (DhKeywordModel *model,
         priv->book_manager = g_object_ref (book_manager);
 }
 
-/* Returns a GList of DhKeywordGlobPattern
- * with GPatternSpec's allocated if there are any
- * special glob characters ('*', '?') in a keyword in keywords.
- * The list returned is the same length as keywords */
+/* For each keyword, creates a DhKeywordGlobPattern with GPatternSpec's
+ * allocated if there are any special glob characters ('*', '?') in the keyword.
+ */
 static GList *
 dh_globbed_keywords_new (GStrv keywords)
 {
-        gint i;
-        gchar *glob;
         GList *list = NULL;
-        DhKeywordGlobPattern *glob_struct;
+        gint i;
 
         if (keywords == NULL) {
                 return NULL;
         }
 
         for (i = 0; keywords[i] != NULL; i++) {
-                glob_struct = g_slice_new (DhKeywordGlobPattern);
-                glob_struct->keyword = keywords[i];
-                if (g_strrstr (keywords[i], "*") || g_strrstr (keywords[i], "?")) {
-                        glob_struct->has_glob = TRUE;
+                DhKeywordGlobPattern *data;
+
+                data = g_slice_new (DhKeywordGlobPattern);
+                data->keyword = keywords[i];
+
+                if (g_strrstr (keywords[i], "*") != NULL ||
+                    g_strrstr (keywords[i], "?") != NULL) {
+                        gchar *glob;
+
+                        data->has_glob = TRUE;
+
                         /* g_pattern_match matches whole strings only, so
                          * for globs, we need to end with a star for partial matches */
                         glob = g_strdup_printf ("%s*", keywords[i]);
-                        glob_struct->glob_pattern_start = g_pattern_spec_new (glob);
+                        data->glob_pattern_start = g_pattern_spec_new (glob);
                         g_free (glob);
 
                         glob = g_strdup_printf ("*%s*", keywords[i]);
-                        glob_struct->glob_pattern_any = g_pattern_spec_new (glob);
+                        data->glob_pattern_any = g_pattern_spec_new (glob);
                         g_free (glob);
                 } else {
-                        glob_struct->has_glob = FALSE;
+                        data->has_glob = FALSE;
                 }
 
-                list = g_list_append (list, (gpointer)glob_struct);
+                list = g_list_prepend (list, data);
         }
 
-        return list;
+        return g_list_reverse (list);
 }
 
 /* Frees all the datastructures and patterns associated with
  * keyword_globs as well as keyword_globs itself.  It does not free
- * DhKeywordGlobPattern->keyword however (only the pattern spects) */
+ * DhKeywordGlobPattern->keyword however (only the pattern specs).
+ */
 static void
 dh_globbed_keywords_free (GList *keyword_globs)
 {
-        GList *list;
-        for (list = keyword_globs; list != NULL; list = g_list_next (list)) {
-                DhKeywordGlobPattern *data = list->data;
+        GList *l;
+
+        for (l = keyword_globs; l != NULL; l = l->next) {
+                DhKeywordGlobPattern *data = l->data;
+
                 if (data->has_glob) {
                         g_pattern_spec_free (data->glob_pattern_start);
                         g_pattern_spec_free (data->glob_pattern_any);
                 }
+
                 g_slice_free (DhKeywordGlobPattern, data);
         }
+
         g_list_free (keyword_globs);
 }