Factor out bookmark list creation

zathura/database-plain.c

@@ -397,9 +397,7 @@ plain_load_bookmarks(zathura_database_t* db, const char* file)
     return NULL;
   }
 
-  girara_list_t* result = girara_sorted_list_new2((girara_compare_function_t)
+  girara_list_t* result = bookmarks_list_new();
-                          zathura_bookmarks_compare, (girara_free_function_t)
-                          zathura_bookmark_free);
 
   gsize num_keys;
   char** keys = g_key_file_get_keys(priv->bookmarks, name, &num_keys, NULL);

zathura/database-sqlite.c

@@ -471,8 +471,7 @@ sqlite_load_bookmarks(zathura_database_t* db, const char* file)
     return NULL;
   }
 
-  girara_list_t* result = girara_sorted_list_new2((girara_compare_function_t) zathura_bookmarks_compare,
+  girara_list_t* result = bookmarks_list_new();
-                          (girara_free_function_t) zathura_bookmark_free);
   if (result == NULL) {
     sqlite3_finalize(stmt);
     return NULL;

zathura/database.c

@@ -76,3 +76,24 @@ zathura_db_get_recent_files(zathura_database_t* db, int max, const char* basepat
 
   return ZATHURA_DATABASE_GET_INTERFACE(db)->get_recent_files(db, max, basepath);
 }
+
+static int
+bookmarks_compare(const void* l, const void* r)
+{
+  const zathura_bookmark_t* lhs = l;
+  const zathura_bookmark_t* rhs = r;
+
+  return zathura_bookmarks_compare(lhs, rhs);
+}
+
+static void
+bookmarks_free(void* p)
+{
+  zathura_bookmark_t* bookmark = p;
+  zathura_bookmark_free(bookmark);
+}
+
+girara_list_t* bookmarks_list_new(void)
+{
+  return girara_sorted_list_new2(bookmarks_compare, bookmarks_free);
+}

zathura/database.h

@@ -140,5 +140,11 @@ bool zathura_db_get_fileinfo(zathura_database_t* db, const char* file,
  */
 girara_list_t* zathura_db_get_recent_files(zathura_database_t* db, int max, const char* basepath);
 
+/**
+ * Create list of bookmarks.
+ * @return empty list of bookmarks
+ */
+girara_list_t* bookmarks_list_new(void);
+
 
 #endif // DATABASE_H