gentoo/boudigi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use g_slice

Browse Source
This commit is contained in:
Tomasz Moń
2009-03-14 12:58:11 +01:00
parent bdb35ddf54
commit 71c3a1e66f
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gui.c
View File

@@ -123,7 +123,7 @@ static void widget_list_add(GtkObject *widget, gint id, gint position, gint valu
{ {
WidgetListElem *el; WidgetListElem *el;
el = g_malloc(sizeof(WidgetListElem)); el = g_slice_new(WidgetListElem);
el->widget = widget; el->widget = widget;
el->id = id; el->id = id;
el->position = position; el->position = position;
@@ -276,7 +276,7 @@ void effect_settings_group_free(EffectSettingsGroup *group)
gtk_widget_destroy(group->child); gtk_widget_destroy(group->child);
g_object_unref(group->child); g_object_unref(group->child);
g_free(group); g_slice_free(EffectSettingsGroup, group);
} }
/** /**
@@ -350,7 +350,7 @@ GtkWidget *create_widget_container(EffectGroup *group, gint amt)
widget = create_table(group[x].settings, group[x].settings_amt); widget = create_table(group[x].settings, group[x].settings_amt);
g_object_ref_sink(widget); g_object_ref_sink(widget);
settings = g_malloc(sizeof(EffectSettingsGroup)); settings = g_slice_new(EffectSettingsGroup);
settings->id = group[x].id; settings->id = group[x].id;
settings->type = group[x].type; settings->type = group[x].type;
settings->position = group[x].position; settings->position = group[x].position;
@@ -715,7 +715,7 @@ static void widget_list_free(GList *list)
{ {
GList *iter; GList *iter;
for (iter = list; iter; iter = iter->next) { for (iter = list; iter; iter = iter->next) {
g_free(iter->data); g_slice_free(WidgetListElem, iter->data);
} }
g_list_free(list); g_list_free(list);
} }

21
preset.c
View File

@@ -51,7 +51,7 @@ static void XMLCALL start(void *data, const char *el, const char **attr) {
if (ad->preset->params != NULL) if (ad->preset->params != NULL)
g_message("Params aleady exists!"); g_message("Params aleady exists!");
} else if (g_strcmp0(el, "Param") == 0) { } else if (g_strcmp0(el, "Param") == 0) {
SettingParam *param = (SettingParam *)g_malloc(sizeof(SettingParam)); SettingParam *param = g_slice_new(SettingParam);
param->id = -1; param->id = -1;
param->position = -1; param->position = -1;
param->value = -1; param->value = -1;
@@ -134,9 +134,9 @@ Preset *create_preset_from_xml_file(gchar *filename)
return NULL; return NULL;
} }
AppData *ad = (AppData *) g_malloc(sizeof(AppData)); AppData *ad = g_slice_new(AppData);
ad->depth = 0; ad->depth = 0;
ad->preset = g_malloc(sizeof(Preset)); ad->preset = g_slice_new(Preset);
ad->preset->name = NULL; ad->preset->name = NULL;
ad->preset->params = NULL; ad->preset->params = NULL;
ad->id = PARSER_TYPE_NOT_SET; ad->id = PARSER_TYPE_NOT_SET;
@@ -152,7 +152,7 @@ Preset *create_preset_from_xml_file(gchar *filename)
(int)XML_GetCurrentLineNumber(p), (int)XML_GetCurrentLineNumber(p),
XML_ErrorString(XML_GetErrorCode(p))); XML_ErrorString(XML_GetErrorCode(p)));
preset_free(ad->preset); preset_free(ad->preset);
g_free(ad); g_slice_free(AppData, ad);
g_free(contents); g_free(contents);
g_object_unref(file); g_object_unref(file);
return NULL; return NULL;
@@ -162,7 +162,7 @@ Preset *create_preset_from_xml_file(gchar *filename)
preset->params = g_list_reverse(preset->params); preset->params = g_list_reverse(preset->params);
XML_ParserFree(p); XML_ParserFree(p);
g_free(ad); g_slice_free(AppData, ad);
g_free(contents); g_free(contents);
g_object_unref(file); g_object_unref(file);
@@ -192,7 +192,7 @@ Preset *create_preset_from_data(GString *data)
total = (unsigned char)data->str[x]; total = (unsigned char)data->str[x];
x++; x++;
Preset *preset = g_malloc(sizeof(Preset)); Preset *preset = g_slice_new(Preset);
preset->name = NULL; /* TODO */ preset->name = NULL; /* TODO */
preset->params = NULL; preset->params = NULL;
@@ -212,7 +212,7 @@ Preset *create_preset_from_data(GString *data)
x+=tmp; x+=tmp;
} }
n++; n++;
SettingParam *param = (SettingParam *)g_malloc(sizeof(SettingParam)); SettingParam *param = g_slice_new(SettingParam);
param->id = id; param->id = id;
param->position = position; param->position = position;
param->value = value; param->value = value;
@@ -236,12 +236,15 @@ void preset_free(Preset *preset)
g_return_if_fail(preset != NULL); g_return_if_fail(preset != NULL);
if (preset->params != NULL) { if (preset->params != NULL) {
g_list_foreach(preset->params, (GFunc)g_free, NULL); GList *iter;
for (iter = preset->params; iter; iter = iter->next) {
g_slice_free(SettingParam, iter->data);
}
g_list_free(preset->params); g_list_free(preset->params);
} }
if (preset->name != NULL) if (preset->name != NULL)
g_free(preset->name); g_free(preset->name);
g_free(preset); g_slice_free(Preset, preset);
} }