[easytag/wip/musicbrainz-support-merge: 33/75] Use slice allocator instead of malloc()

[David King <davidk src gnome org>]

commit fd03bfabf810ed5d568fc975115550da9650e9c3
Author: Abhinav <abhijangda hotmail com>
Date:   Thu Jul 24 12:59:02 2014 +0530

    Use slice allocator instead of malloc()

 src/mb_search.c          |   16 ++++++++--------
 src/mbentityview.c       |    6 +++---
 src/musicbrainz_dialog.c |   29 +++++++++++++++--------------
 3 files changed, 26 insertions(+), 25 deletions(-)
---
diff --git a/src/mb_search.c b/src/mb_search.c
index a80a845..5cb7a63 100755
--- a/src/mb_search.c
+++ b/src/mb_search.c
@@ -255,7 +255,7 @@ et_musicbrainz_search_in_entity (MbEntityKind child_type,
                                                             1, param_names,
                                                             param_values);
                         CHECK_CANCELLED(cancellable);
-                        entity = g_malloc (sizeof (EtMbEntity));
+                        entity = g_slice_new (EtMbEntity);
                         entity->entity = mb5_release_clone (mb5_metadata_get_release (metadata_release));
                         entity->type = MB_ENTITY_KIND_ALBUM;
                         entity->is_red_line = FALSE;
@@ -355,7 +355,7 @@ et_musicbrainz_search_in_entity (MbEntityKind child_type,
                                                                   param_names,
                                                                   param_values);
                             CHECK_CANCELLED(cancellable);
-                            entity = g_malloc (sizeof (EtMbEntity));
+                            entity = g_slice_new (EtMbEntity);
                             entity->entity = mb5_recording_clone (mb5_metadata_get_recording 
(metadata_recording));
                             entity->type = MB_ENTITY_KIND_TRACK;
                             entity->is_red_line = FALSE;
@@ -497,7 +497,7 @@ et_musicbrainz_search (gchar *string, MbEntityKind type, GNode *root,
                     {
                         GNode *node;
                         EtMbEntity *entity;
-                        entity = g_malloc (sizeof (EtMbEntity));
+                        entity = g_slice_new (EtMbEntity);
                         entity->entity = mb5_artist_clone (artist);
                         entity->type = MB_ENTITY_KIND_ARTIST;
                         entity->is_red_line = FALSE;
@@ -576,7 +576,7 @@ et_musicbrainz_search (gchar *string, MbEntityKind type, GNode *root,
                                                             1, param_names,
                                                             param_values);
                         CHECK_CANCELLED(cancellable);
-                        entity = g_malloc (sizeof (EtMbEntity));
+                        entity = g_slice_new (EtMbEntity);
                         entity->entity = mb5_release_clone (mb5_metadata_get_release (metadata_release));
                         entity->type = MB_ENTITY_KIND_ALBUM;
                         entity->is_red_line = FALSE;
@@ -650,7 +650,7 @@ et_musicbrainz_search (gchar *string, MbEntityKind type, GNode *root,
                                                           1, param_names,
                                                           param_values);
                     CHECK_CANCELLED(cancellable);
-                    entity = g_malloc (sizeof (EtMbEntity));
+                    entity = g_slice_new (EtMbEntity);
                     entity->entity = mb5_recording_clone (mb5_metadata_get_recording (metadata_recording));
                     entity->type = MB_ENTITY_KIND_TRACK;
                     entity->is_red_line = FALSE;
@@ -730,7 +730,7 @@ et_musicbrainz_search (gchar *string, MbEntityKind type, GNode *root,
                                                             1, param_names,
                                                             param_values);
                         CHECK_CANCELLED(cancellable);
-                        entity = g_malloc (sizeof (EtMbEntity));
+                        entity = g_slice_new (EtMbEntity);
                         entity->entity = mb5_release_clone (mb5_metadata_get_release (metadata_release));
                         entity->type = MB_ENTITY_KIND_ALBUM;
                         entity->is_red_line = FALSE;
@@ -789,7 +789,7 @@ et_musicbrainz_search (gchar *string, MbEntityKind type, GNode *root,
                         size = mb5_freedbdisc_get_title (freedbdisc,
                                                          buf, sizeof (buf));
                         buf [size] = '\0';
-                        entity = g_malloc (sizeof (EtMbEntity));
+                        entity = g_slice_new (EtMbEntity);
                         entity->entity = mb5_freedbdisc_clone (freedbdisc);
                         entity->type = MB_ENTITY_KIND_FREEDBID;
                         entity->is_red_line = FALSE;
@@ -893,7 +893,7 @@ free_mb_tree (GNode **_node)
         }
     }
 
-    g_free (et_entity);
+    g_slice_free (EtMbEntity, et_entity);
     g_node_unlink (node);
     child = g_node_first_child (node);
 
diff --git a/src/mbentityview.c b/src/mbentityview.c
index 52caefa..698e034 100644
--- a/src/mbentityview.c
+++ b/src/mbentityview.c
@@ -662,7 +662,7 @@ search_in_levels_callback (GObject *source, GAsyncResult *res,
         !g_simple_async_result_get_op_res_gboolean (G_SIMPLE_ASYNC_RESULT (res)))
     {
         g_object_unref (res);
-        g_free (user_data);
+        g_slice_free (SearchInLevelThreadData, user_data);
         return;
     }
 
@@ -722,7 +722,7 @@ search_in_levels_callback (GObject *source, GAsyncResult *res,
         g_object_unref (res);
     }
 
-    g_free (thread_data);
+    g_slice_free (SearchInLevelThreadData, thread_data);
     et_music_brainz_dialog_stop_set_sensitive (FALSE);
 
     if (exit_on_complete)
@@ -893,7 +893,7 @@ search_in_levels (EtMbEntityView *entity_view, GNode *child,
         return;
     }
 
-    thread_data = g_malloc (sizeof (SearchInLevelThreadData));
+    thread_data = g_slice_new (SearchInLevelThreadData);
     thread_data->entity_view = entity_view;
     thread_data->child = child;
     priv = ET_MB_ENTITY_VIEW_GET_PRIVATE (entity_view);
diff --git a/src/musicbrainz_dialog.c b/src/musicbrainz_dialog.c
index 57d1654..f92b10a 100755
--- a/src/musicbrainz_dialog.c
+++ b/src/musicbrainz_dialog.c
@@ -288,17 +288,18 @@ et_mb_destroy_search (EtMbSearch **search)
         if ((*search)->type == ET_MB_SEARCH_TYPE_MANUAL)
         {
             g_free (((EtMbManualSearch *)(*search))->to_search);
+            g_slice_free (EtMbManualSearch, (EtMbManualSearch *)*search);
         }
         else if ((*search)->type == ET_MB_SEARCH_TYPE_SELECTED)
         {
             g_list_free_full (((EtMbSelectedSearch *)(*search))->list_iter,
                               (GDestroyNotify)gtk_tree_iter_free);
+            g_slice_free (EtMbSelectedSearch, (EtMbSelectedSearch *)*search);
         }
         else if ((*search)->type == ET_MB_SEARCH_TYPE_AUTOMATIC)
         {
+            g_slice_free (EtMbAutomaticSearch, (EtMbAutomaticSearch *)*search);
         }
-
-        g_free (*search);
     }
 }
 
@@ -316,7 +317,7 @@ et_mb_set_search_manual (EtMbSearch **search, gchar *to_search,
                          GNode *node, MbEntityKind type)
 {
     et_mb_destroy_search (search);
-    *search = g_malloc (sizeof (EtMbManualSearch));
+    *search = (EtMbSearch *)g_slice_new (EtMbManualSearch);
     ((EtMbManualSearch *)(*search))->to_search = g_strdup (to_search);
     (*search)->type = ET_MB_SEARCH_TYPE_MANUAL;
     ((EtMbManualSearch *)(*search))->parent_node = node;
@@ -334,7 +335,7 @@ static void
 et_mb_set_selected_search (EtMbSearch **search, GList *list_files)
 {
     et_mb_destroy_search (search);
-    *search = g_malloc (sizeof (EtMbSelectedSearch));
+    *search = (EtMbSearch *)g_slice_new (EtMbSelectedSearch);
     (*search)->type = ET_MB_SEARCH_TYPE_SELECTED;
     ((EtMbSelectedSearch *)(*search))->list_iter = list_files;
 }
@@ -349,7 +350,7 @@ static void
 et_mb_set_automatic_search (EtMbSearch **search)
 {
     et_mb_destroy_search (search);
-    *search = g_malloc (sizeof (EtMbAutomaticSearch));
+    *search = (EtMbSearch *)g_slice_new (EtMbAutomaticSearch);
     (*search)->type = ET_MB_SEARCH_TYPE_AUTOMATIC;
 }
 
@@ -370,7 +371,7 @@ manual_search_callback (GObject *source, GAsyncResult *res,
     if (!g_simple_async_result_get_op_res_gboolean (G_SIMPLE_ASYNC_RESULT (res)))
     {
         g_object_unref (res);
-        g_free (user_data);
+        g_slice_free (ManualSearchThreadData, user_data);
 
         if (mb_dialog_priv)
         {
@@ -396,7 +397,7 @@ manual_search_callback (GObject *source, GAsyncResult *res,
                              ((ManualSearchThreadData *)user_data)->text_to_search,
                              mb_dialog_priv->mb_tree_root,
                              ((ManualSearchThreadData *)user_data)->type);
-    g_free (user_data);
+    g_slice_free (ManualSearchThreadData, user_data);
 }
 
 /*
@@ -570,7 +571,7 @@ btn_manual_find_clicked (GtkWidget *btn, gpointer user_data)
     et_mb_entity_view_clear_all (ET_MB_ENTITY_VIEW (entityView));
     cb_manual_search = GTK_WIDGET (gtk_builder_get_object (builder,
                                                            "cbManualSearch"));
-    thread_data = g_malloc (sizeof (ManualSearchThreadData));
+    thread_data = g_slice_new (ManualSearchThreadData);
     thread_data->type = type;
     thread_data->text_to_search = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (cb_manual_search));
     mb5_search_cancellable = g_cancellable_new ();
@@ -765,7 +766,7 @@ selected_find_callback (GObject *source, GAsyncResult *res,
     {
         g_object_unref (res);
         g_hash_table_destroy (((SelectedFindThreadData *)user_data)->hash_table);
-        g_free (user_data);
+        g_slice_free (SelectedFindThreadData, user_data);
         free_mb_tree (&mb_dialog_priv->mb_tree_root);
         mb_dialog_priv->mb_tree_root = g_node_new (NULL);
         return;
@@ -786,7 +787,7 @@ selected_find_callback (GObject *source, GAsyncResult *res,
 
     et_mb_set_selected_search (&mb_dialog_priv->search,
                                ((SelectedFindThreadData *)user_data)->list_iter);
-    g_free (user_data);
+    g_slice_free (SelectedFindThreadData, user_data);
 }
 
 /*
@@ -963,7 +964,7 @@ btn_selected_find_clicked (GtkWidget *button, gpointer data)
         }
     }
 
-    thread_data = g_malloc (sizeof (SelectedFindThreadData));
+    thread_data = g_slice_new (SelectedFindThreadData);
     thread_data->hash_table = hash_table;
     thread_data->list_iter = iter_list;
     mb5_search_cancellable = g_cancellable_new ();
@@ -1043,7 +1044,7 @@ discid_search_callback (GObject *source, GAsyncResult *res,
     gtk_statusbar_push (GTK_STATUSBAR (gtk_builder_get_object (builder, "statusbar")),
                         0, _("Searching Completed"));
     g_object_unref (res);
-    g_free (user_data);
+    g_slice_free (DiscIDSearchThreadData, thread_data);
     et_music_brainz_dialog_stop_set_sensitive (FALSE);
 
     if (exit_on_complete)
@@ -1706,7 +1707,7 @@ et_music_brainz_dialog_destroy (GtkWidget *widget)
     gtk_widget_destroy (widget);
     g_object_unref (G_OBJECT (builder));
     free_mb_tree (&mb_dialog_priv->mb_tree_root);
-    g_free (mb_dialog_priv);
+    g_slice_free (MusicBrainzDialogPrivate, mb_dialog_priv);
     mb_dialog_priv = NULL;
 }
 
@@ -1812,7 +1813,7 @@ et_open_musicbrainz_dialog ()
         return;
     }
 
-    mb_dialog_priv = g_malloc (sizeof (MusicBrainzDialogPrivate));
+    mb_dialog_priv = g_slice_new (MusicBrainzDialogPrivate);
     mb_dialog_priv->mb_tree_root = g_node_new (NULL);
     mb_dialog_priv->search = NULL;
     exit_on_complete = FALSE;