date.c: Convert from LGPL-2+ to GPL-3+

[notmuch] / notmuch-index-message.cc

diff --git a/notmuch-index-message.cc b/notmuch-index-message.cc
index 3175d2d829b26b9c8db72d9d962bdf141cdb9851..e3de80f1ec63e9d7877e11485425f3d368ccfc83 100644 (file)
--- a/notmuch-index-message.cc
+++ b/notmuch-index-message.cc
@@ -411,7 +411,8 @@ find_thread_ids (Xapian::Database db,
     const char *parent_message_id;
     GPtrArray *result;
 
-    thread_ids = g_hash_table_new (g_str_hash, g_str_equal);
+    thread_ids = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                       free, NULL);
 
     find_messages_by_term (db, "ref", message_id, &child, &children_end);
     for ( ; child != children_end; child++) {
@@ -432,6 +433,13 @@ find_thread_ids (Xapian::Database db,
        char *id = (char *) l->data;
        g_ptr_array_add (result, id);
     }
+    g_list_free (keys);
+
+    /* We're done with the hash table, but we've taken the pointers to
+     * the allocated strings and put them into our result array, so
+     * tell the hash not to free them on its way out. */
+    g_hash_table_steal_all (thread_ids);
+    g_hash_table_unref (thread_ids);
 
     return result;
 }
@@ -486,6 +494,10 @@ gen_terms_body_str (Xapian::TermGenerator term_gen,
        while (*next_line == '\n')
            next_line++;
 
+       /* Skip blank lines. */
+       if (line_end < line)
+           continue;
+
        /* Skip lines that are quotes. */
        if (*line == '>')
            continue;
@@ -813,6 +825,8 @@ main (int argc, char **argv)
            }
        }
 
+       g_io_channel_unref (channel);
+
        gettimeofday (&tv_now, NULL);
        elapsed = (tv_now.tv_sec - tv_start.tv_sec +
                   (tv_now.tv_usec - tv_start.tv_usec) / 1e6);